PWN-9092 - fix error handling on update share (#1895)

p2p-org · Jun 29, 2023 · d47f3f7 · d47f3f7
1 parent b7a8762
commit d47f3f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/src/main/java/org/p2p/wallet/settings/ui/devices/DevicesPresenter.kt b/app/src/main/java/org/p2p/wallet/settings/ui/devices/DevicesPresenter.kt
@@ -38,10 +38,7 @@ class DevicesPresenter(
         val isTorusKeyValid = restoreFlowDataLocalRepository.isTorusKeyValid()
         if (isTorusKeyValid) {
             launch {
-                view?.setLoadingState(isScreenLoading = true)
                 updateDeviceShare()
-                view?.setLoadingState(isScreenLoading = false)
-                view?.showSuccessDeviceChange()
             }
         } else {
             submitUserPhoneNumber()
@@ -58,12 +55,16 @@ class DevicesPresenter(
     }
 
     private suspend fun refreshDeviceShare(newMetadata: GatewayOnboardingMetadata) {
+        view?.setLoadingState(isScreenLoading = true)
         try {
             restoreWalletInteractor.refreshDeviceShare()
             metadataInteractor.updateMetadata(newMetadata)
+            view?.showSuccessDeviceChange()
         } catch (error: Throwable) {
             view?.showFailDeviceChange()
             Timber.e(error, "Error on refreshDeviceShare")
+        } finally {
+            view?.setLoadingState(isScreenLoading = false)
         }
     }
 

diff --git a/app/src/main/java/org/p2p/wallet/settings/ui/mail/SettingsEmailConfirmPresenter.kt b/app/src/main/java/org/p2p/wallet/settings/ui/mail/SettingsEmailConfirmPresenter.kt
@@ -65,13 +65,13 @@ class SettingsEmailConfirmPresenter(
             deviceNameTimestampSec = DateTimeUtils.getCurrentTimestampInSeconds()
         )
         refreshDeviceShare(newMetadata)
-        view?.showSuccessDeviceChange()
     }
 
     private suspend fun refreshDeviceShare(newMetadata: GatewayOnboardingMetadata) {
         try {
             restoreWalletInteractor.refreshDeviceShare()
             metadataInteractor.updateMetadata(newMetadata)
+            view?.showSuccessDeviceChange()
         } catch (error: Throwable) {
             view?.showFailDeviceChange()
             Timber.e(error, "Error on refreshDeviceShare")