From b8541f9912b61cb226a586e9459219282b306b02 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Thu, 27 Jun 2024 12:38:31 +0200
Subject: [PATCH] Add a hideProgressCatching method to avoid crashing when
 showing progress

The same way we did it for showProgressCatching()
---
 Core                                                          | 2 +-
 .../com/infomaniak/mail/ui/alertDialogs/BaseAlertDialog.kt    | 4 ++--
 .../main/java/com/infomaniak/mail/ui/login/LoginFragment.kt   | 2 +-
 .../com/infomaniak/mail/ui/main/InvalidPasswordFragment.kt    | 2 +-
 .../mail/ui/main/menu/RestoreEmailsBottomSheetDialog.kt       | 2 +-
 .../com/infomaniak/mail/ui/main/user/AttachMailboxFragment.kt | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Core b/Core
index 574f47a3a8..5eecfa5e3c 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit 574f47a3a8ad99fe7f254343f536c132dee9882e
+Subproject commit 5eecfa5e3cd4fd815c310a56a299b60f5de1fa21
diff --git a/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/BaseAlertDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/BaseAlertDialog.kt
index 50995f3abe..7f049e453c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/BaseAlertDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/alertDialogs/BaseAlertDialog.kt
@@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import com.google.android.material.button.MaterialButton
 import com.infomaniak.lib.core.utils.Utils
-import com.infomaniak.lib.core.utils.hideProgress
+import com.infomaniak.lib.core.utils.hideProgressCatching
 import com.infomaniak.lib.core.utils.initProgress
 import com.infomaniak.lib.core.utils.showProgressCatching
 import com.infomaniak.mail.R
@@ -50,7 +50,7 @@ abstract class BaseAlertDialog(activityContext: Context) : DefaultLifecycleObser
 
     fun resetLoadingAndDismiss() = with(alertDialog) {
         if (isShowing) {
-            positiveButton.hideProgress(R.string.buttonCreate)
+            positiveButton.hideProgressCatching(R.string.buttonCreate)
             negativeButton.isEnabled = true
             setCancelable(true)
             dismiss()
diff --git a/app/src/main/java/com/infomaniak/mail/ui/login/LoginFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/login/LoginFragment.kt
index 3fff87cb7d..f4bb74b099 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/login/LoginFragment.kt
@@ -187,7 +187,7 @@ class LoginFragment : Fragment() {
 
     private fun resetLoginButtons() = with(binding) {
         connectButtonProgressTimer.cancel()
-        connectButton.hideProgress(RCore.string.connect)
+        connectButton.hideProgressCatching(RCore.string.connect)
         signInButton.isEnabled = true
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/InvalidPasswordFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/InvalidPasswordFragment.kt
index 1ed65dbd8f..c75bfe4497 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/InvalidPasswordFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/InvalidPasswordFragment.kt
@@ -110,7 +110,7 @@ class InvalidPasswordFragment : Fragment() {
             passwordInputLayout.error = getString(error)
             passwordInput.text = null
             updatePasswordButtonProgressTimer.cancel()
-            confirmButton.hideProgress(R.string.buttonConfirm)
+            confirmButton.hideProgressCatching(R.string.buttonConfirm)
         }
 
         invalidPasswordViewModel.detachMailboxResult.observe(viewLifecycleOwner) { error ->
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/menu/RestoreEmailsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/main/menu/RestoreEmailsBottomSheetDialog.kt
index b8eea9125a..eb8a4520fe 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/menu/RestoreEmailsBottomSheetDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/menu/RestoreEmailsBottomSheetDialog.kt
@@ -114,7 +114,7 @@ class RestoreEmailsBottomSheetDialog : BottomSheetDialogFragment() {
         val formattedDate = formattedDates?.get(date) ?: date
         restoreEmailViewModel.restoreEmails(formattedDate).observe(viewLifecycleOwner) { apiResponse ->
             restoreEmailsButtonProgressTimer.cancel()
-            binding.restoreMailsButton.hideProgress(R.string.buttonConfirmRestoreEmails)
+            binding.restoreMailsButton.hideProgressCatching(R.string.buttonConfirmRestoreEmails)
             showSnackbar(if (apiResponse.isSuccess()) R.string.snackbarRestorationLaunched else apiResponse.translatedError)
             findNavController().popBackStack()
         }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/user/AttachMailboxFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/user/AttachMailboxFragment.kt
index c484af6488..b16bdf544b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/user/AttachMailboxFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/user/AttachMailboxFragment.kt
@@ -126,7 +126,7 @@ class AttachMailboxFragment : Fragment() {
 
             passwordInput.text = null
             attachMailboxButtonProgressTimer.cancel()
-            attachMailboxButton.hideProgress(R.string.buttonAttachMailbox)
+            attachMailboxButton.hideProgressCatching(R.string.buttonAttachMailbox)
         }
     }