refactor: move capabilities handling to SpaceLinksViewModel

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/capabilities/CapabilityViewModel.kt

@@ -25,12 +25,10 @@ package com.owncloud.android.presentation.capabilities
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.ViewModel
-import com.owncloud.android.domain.capabilities.model.CapabilityBooleanType
 import com.owncloud.android.domain.capabilities.model.OCCapability
 import com.owncloud.android.domain.capabilities.usecases.GetCapabilitiesAsLiveDataUseCase
 import com.owncloud.android.domain.capabilities.usecases.GetStoredCapabilitiesUseCase
 import com.owncloud.android.domain.capabilities.usecases.RefreshCapabilitiesFromServerAsyncUseCase
-import com.owncloud.android.domain.links.model.OCLinkType
 import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResultAndUseCachedData
 import com.owncloud.android.presentation.common.UIResult
@@ -83,11 +81,4 @@ class CapabilityViewModel(
         capabilities?.spaces?.hasMultiplePersonalSpaces == true
     }
 
-    fun checkPasswordEnforced(selectedPermission: OCLinkType, capabilities: OCCapability?) =
-        when(selectedPermission) {
-            OCLinkType.CAN_VIEW -> capabilities?.filesSharingPublicPasswordEnforcedReadOnly == CapabilityBooleanType.TRUE
-            OCLinkType.CAN_EDIT -> capabilities?.filesSharingPublicPasswordEnforcedReadWrite == CapabilityBooleanType.TRUE
-            OCLinkType.CREATE_ONLY -> capabilities?.filesSharingPublicPasswordEnforcedUploadOnly == CapabilityBooleanType.TRUE
-            else -> true
-        }
 }

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/links/AddPublicLinkFragment.kt

@@ -31,19 +31,15 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.owncloud.android.R
 import com.owncloud.android.databinding.AddPublicLinkFragmentBinding
-import com.owncloud.android.domain.capabilities.model.OCCapability
 import com.owncloud.android.domain.links.model.OCLinkType
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.extensions.collectLatestLifecycleFlow
 import com.owncloud.android.extensions.hideSoftKeyboard
 import com.owncloud.android.extensions.showErrorInSnackbar
-import com.owncloud.android.presentation.capabilities.CapabilityViewModel
 import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.utils.DisplayUtils
 import org.koin.androidx.viewmodel.ext.android.activityViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.TimeZone
@@ -60,13 +56,7 @@ class AddPublicLinkFragment: Fragment(), SetPasswordDialogFragment.SetPasswordLi
             requireArguments().getParcelable(ARG_CURRENT_SPACE)
         )
     }
-    private val capabilityViewModel: CapabilityViewModel by viewModel {
-        parametersOf(
-            accountName
-        )
-    }
 
-    private var capabilities: OCCapability? = null
     private var isPasswordEnforced = true
     private var hasPassword = false
 
@@ -130,18 +120,6 @@ class AddPublicLinkFragment: Fragment(), SetPasswordDialogFragment.SetPasswordLi
             }
         }
 
-        capabilityViewModel.capabilities.observe(viewLifecycleOwner) { event->
-            when (val uiResult = event.peekContent()) {
-                is UIResult.Success -> {
-                    capabilities = uiResult.data
-                }
-                is UIResult.Loading -> { }
-                is UIResult.Error -> {
-                    Timber.e(uiResult.error, "Failed to retrieve server capabilities")
-                }
-            }
-        }
-
         collectLatestLifecycleFlow(spaceLinksViewModel.addLinkResultFlow) { event ->
             event?.peekContent()?.let { uiResult ->
                 when (uiResult) {
@@ -203,7 +181,7 @@ class AddPublicLinkFragment: Fragment(), SetPasswordDialogFragment.SetPasswordLi
             selectedRadioButton.isChecked = true
         }
         val selectedPermission = selectedRadioButton.tag as OCLinkType
-        isPasswordEnforced = capabilityViewModel.checkPasswordEnforced(selectedPermission, capabilities)
+        isPasswordEnforced = spaceLinksViewModel.checkPasswordEnforced(selectedPermission)
         spaceLinksViewModel.onPermissionSelected(selectedPermission)
     }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/links/SpaceLinksViewModel.kt

@@ -21,6 +21,10 @@
 package com.owncloud.android.presentation.spaces.links
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.owncloud.android.domain.capabilities.model.CapabilityBooleanType
+import com.owncloud.android.domain.capabilities.model.OCCapability
+import com.owncloud.android.domain.capabilities.usecases.GetStoredCapabilitiesUseCase
 import com.owncloud.android.domain.links.model.OCLinkType
 import com.owncloud.android.domain.links.usecases.AddLinkUseCase
 import com.owncloud.android.domain.links.usecases.RemoveLinkUseCase
@@ -34,9 +38,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 
 class SpaceLinksViewModel(
     private val addLinkUseCase: AddLinkUseCase,
+    private val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase,
     private val removeLinkUseCase: RemoveLinkUseCase,
     private val accountName: String,
     private val space: OCSpace,
@@ -52,8 +58,13 @@ class SpaceLinksViewModel(
     private val _removeLinkResultFlow = MutableSharedFlow<UIResult<Unit>>()
     val removeLinkResultFlow: SharedFlow<UIResult<Unit>> = _removeLinkResultFlow
 
+    private var capabilities: OCCapability? = null
+
     init {
         _addPublicLinkUIState.value = AddPublicLinkUIState()
+        viewModelScope.launch(coroutineDispatcherProvider.io) {
+            capabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(accountName))
+        }
     }
 
     fun onPermissionSelected(permission: OCLinkType) {
@@ -99,6 +110,14 @@ class SpaceLinksViewModel(
         )
     }
 
+    fun checkPasswordEnforced(selectedPermission: OCLinkType) =
+        when(selectedPermission) {
+            OCLinkType.CAN_VIEW -> capabilities?.filesSharingPublicPasswordEnforcedReadOnly == CapabilityBooleanType.TRUE
+            OCLinkType.CAN_EDIT -> capabilities?.filesSharingPublicPasswordEnforcedReadWrite == CapabilityBooleanType.TRUE
+            OCLinkType.CREATE_ONLY -> capabilities?.filesSharingPublicPasswordEnforcedUploadOnly == CapabilityBooleanType.TRUE
+            else -> true
+        }
+
     fun resetViewModel() {
         _addLinkResultFlow.value = null
         _addPublicLinkUIState.value = AddPublicLinkUIState()