fix(InfiniteLoading): Fix inifinite loading in SyncSettingsActivity

Infomaniak · Oct 18, 2024 · e031ec5 · e031ec5
1 parent 19543ab
commit e031ec5
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SyncSettingsActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SyncSettingsActivity.kt
@@ -53,6 +53,8 @@ import com.infomaniak.drive.utils.SyncUtils.activateAutoSync
 import com.infomaniak.drive.utils.SyncUtils.disableAutoSync
 import com.infomaniak.drive.utils.Utils
 import com.infomaniak.lib.core.utils.*
+import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
+import io.sentry.Sentry
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
@@ -367,17 +369,27 @@ class SyncSettingsActivity : BaseActivity() {
     private fun saveSettings() = with(binding) {
         saveButton.showProgressCatching()
         lifecycleScope.launch(Dispatchers.IO) {
-            if (activateSyncSwitch.isChecked) {
-                val syncSettings = generateSyncSettings()
-                trackPhotoSyncEvents(syncSettings)
-                syncSettings.setIntervalType(syncSettingsViewModel.syncIntervalType.value!!)
-                UploadFile.setAppSyncSettings(syncSettings)
-                activateAutoSync(syncSettings)
-            } else {
-                disableAutoSync()
-            }
+            runCatching {
+                if (activateSyncSwitch.isChecked) {
+                    val syncSettings = generateSyncSettings()
+                    trackPhotoSyncEvents(syncSettings)
+                    syncSettings.setIntervalType(syncSettingsViewModel.syncIntervalType.value!!)
+                    UploadFile.setAppSyncSettings(syncSettings)
+                    activateAutoSync(syncSettings)
+                } else {
+                    disableAutoSync()
+                }
 
-            trackPhotoSyncEvent(if (activateSyncSwitch.isChecked) "enabled" else "disabled")
+                trackPhotoSyncEvent(if (activateSyncSwitch.isChecked) "enabled" else "disabled")
+            }.onFailure {
+                it.printStackTrace()
+                showSnackbar(R.string.anErrorHasOccurred)
+                Sentry.captureException(it) { scope ->
+                    scope.setTag("syncIntervalType", syncSettingsViewModel.syncIntervalType.value?.title.toString())
+                    scope.setTag("createMonthFolder", createDatedSubFoldersSwitch.isChecked.toString())
+                    scope.setTag("deletePhoto", deletePicturesAfterSyncSwitch.isChecked.toString())
+                }
+            }
 
             Dispatchers.Main {
                 saveButton.hideProgressCatching(R.string.buttonSave)