Skip to content

Commit 88fd61b

Browse files
committed
refactor: remove unnecessary roles loading
Signed-off-by: Jorge Aguado Recio <jaguado@izertis.com>
1 parent 33619db commit 88fd61b

2 files changed

Lines changed: 1 addition & 31 deletions

File tree

‎owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -116,32 +116,12 @@ class GraphShareFragment : Fragment(), GraphSharesAdapter.GraphSharesAdapterList
116116
}
117117

118118
private fun subscribeToViewModels() {
119-
observeRoles()
120119
observeShares()
121120
observeSpacePermissions()
122121
observeAddShareResult()
123122
observeEditShareResult()
124123
}
125124

126-
private fun observeRoles() {
127-
collectLatestLifecycleFlow(graphShareViewModel.roles) { event ->
128-
event?.let {
129-
when (val uiResult = event.peekContent()) {
130-
is UIResult.Success -> {
131-
uiResult.data?.let {
132-
graphShareViewModel.getGraphShares()
133-
}
134-
}
135-
is UIResult.Loading -> { }
136-
is UIResult.Error -> {
137-
showErrorInSnackbar(R.string.share_sync_failed, uiResult.error)
138-
Timber.e(uiResult.error, "Failed to retrieve platform roles")
139-
}
140-
}
141-
}
142-
}
143-
}
144-
145125
private fun observeShares() {
146126
collectLatestLifecycleFlow(graphShareViewModel.shares) { event ->
147127
event?.let {

‎owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareViewModel.kt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.owncloud.android.domain.files.model.OCFile
3030
import com.owncloud.android.domain.members.model.OCMember
3131
import com.owncloud.android.domain.members.usecases.SearchMembersUseCase
3232
import com.owncloud.android.domain.roles.model.OCRole
33-
import com.owncloud.android.domain.roles.usecases.GetRolesAsyncUseCase
3433
import com.owncloud.android.domain.sharing.shares.usecases.AddGraphShareAsyncUseCase
3534
import com.owncloud.android.domain.sharing.shares.usecases.EditGraphShareAsyncUseCase
3635
import com.owncloud.android.domain.sharing.shares.usecases.GetGraphSharesAsyncUseCase
@@ -53,7 +52,6 @@ import kotlinx.coroutines.launch
5352
class GraphShareViewModel(
5453
private val addGraphShareAsyncUseCase: AddGraphShareAsyncUseCase,
5554
private val editGraphShareAsyncUseCase: EditGraphShareAsyncUseCase,
56-
private val getRolesAsyncUseCase: GetRolesAsyncUseCase,
5755
private val getGraphSharesAsyncUseCase: GetGraphSharesAsyncUseCase,
5856
private val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase,
5957
private val searchMembersUseCase: SearchMembersUseCase,
@@ -64,9 +62,6 @@ class GraphShareViewModel(
6462
private val coroutineDispatcherProvider: CoroutinesDispatcherProvider,
6563
) : ViewModel() {
6664

67-
private val _roles = MutableStateFlow<Event<UIResult<List<OCRole>>>?>(null)
68-
val roles: StateFlow<Event<UIResult<List<OCRole>>>?> = _roles
69-
7065
private val _shares = MutableStateFlow<Event<UIResult<OCPermissions>>?>(null)
7166
val shares: StateFlow<Event<UIResult<OCPermissions>>?> = _shares
7267

@@ -92,12 +87,6 @@ class GraphShareViewModel(
9287
val spacePermissions: StateFlow<Event<UIResult<List<String>>>?> = _spacePermissions
9388

9489
init {
95-
runUseCaseWithResult(
96-
coroutineDispatcher = coroutineDispatcherProvider.io,
97-
flow = _roles,
98-
useCase = getRolesAsyncUseCase,
99-
useCaseParams = GetRolesAsyncUseCase.Params(accountName = accountName),
100-
)
10190
runUseCaseWithResult(
10291
coroutineDispatcher = coroutineDispatcherProvider.io,
10392
showLoading = false,
@@ -108,6 +97,7 @@ class GraphShareViewModel(
10897
viewModelScope.launch(coroutineDispatcherProvider.io) {
10998
capabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(accountName))
11099
}
100+
getGraphShares()
111101
getSpacePermissions()
112102
}
113103

0 commit comments

Comments
 (0)