refactor: run password update only after successful link edit

Author: joragua

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

@@ -140,8 +140,13 @@ class AddPublicLinkFragment: Fragment(), SetPasswordDialogFragment.SetPasswordLi
             event?.peekContent()?.let { uiResult ->
                 when (uiResult) {
                     is UIResult.Loading -> { }
-                    is UIResult.Success -> parentFragmentManager.popBackStack()
-                    is UIResult.Error -> showErrorInSnackbar(R.string.public_link_edit_failed, uiResult.error)
+                    is UIResult.Success -> {
+                        selectedPublicLink?.let { spaceLinksViewModel.editPasswordPublicLink(it.id) }
+                        parentFragmentManager.popBackStack()
+                    }
+                    is UIResult.Error -> {
+                        showErrorInSnackbar(R.string.public_link_edit_failed, uiResult.error)
+                    }
                 }
             }
         }

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

@@ -65,6 +65,9 @@ class SpaceLinksViewModel(
     private val _editLinkResultFlow = MutableStateFlow<Event<UIResult<Unit>>?>(null)
     val editLinkResultFlow: StateFlow<Event<UIResult<Unit>>?> = _editLinkResultFlow
 
+    private val _editPasswordLinkResultFlow = MutableStateFlow<Event<UIResult<Unit>>?>(null)
+    val editPasswordLinkResultFlow: StateFlow<Event<UIResult<Unit>>?> = _editPasswordLinkResultFlow
+
     private var capabilities: OCCapability? = null
 
     init {
@@ -132,16 +135,22 @@ class SpaceLinksViewModel(
                     expirationDate = _addPublicLinkUIState.value?.selectedExpirationDate,
                 )
             )
-            if (_addPublicLinkUIState.value?.wasPasswordChanged == true) {
-                viewModelScope.launch(coroutineDispatcherProvider.io) {
-                    editPasswordLinkUseCase(EditPasswordLinkUseCase.Params(
-                        accountName = accountName,
-                        spaceId = space.id,
-                        linkId = linkId,
-                        password = _addPublicLinkUIState.value?.selectedPassword
-                    ))
-                }
-            }
+        }
+    }
+
+    fun editPasswordPublicLink(linkId: String) {
+        if (_addPublicLinkUIState.value?.wasPasswordChanged == true) {
+            runUseCaseWithResult(
+                coroutineDispatcher = coroutineDispatcherProvider.io,
+                flow = _editLinkResultFlow,
+                useCase = editPasswordLinkUseCase,
+                useCaseParams = EditPasswordLinkUseCase.Params(
+                    accountName = accountName,
+                    spaceId = space.id,
+                    linkId = linkId,
+                    password = _addPublicLinkUIState.value?.selectedPassword
+                )
+            )
         }
     }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt

@@ -220,6 +220,7 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
         observeAddLinkResult()
         observeRemoveLinkResult()
         observeEditLinkResult()
+        observeEditPasswordLinkResult()
     }
 
     private fun observeRoles() {
@@ -385,6 +386,18 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
         }
     }
 
+    private fun observeEditPasswordLinkResult() {
+        collectLatestLifecycleFlow(spaceLinksViewModel.editPasswordLinkResultFlow) { event ->
+            event?.peekContent()?.let { uiResult ->
+                when (uiResult) {
+                    is UIResult.Loading -> { }
+                    is UIResult.Success -> spaceLinksViewModel.resetViewModel()
+                    is UIResult.Error -> showErrorInSnackbar(R.string.public_link_edit_failed, uiResult.error)
+                }
+            }
+        }
+    }
+
     private fun checkPermissions(spacePermissions: List<String>) {
         val hasCreatePermission = DRIVES_CREATE_PERMISSION in spacePermissions
         canRemoveMembersAndLinks = DRIVES_DELETE_PERMISSION in spacePermissions