Merge pull request #201 from Infomaniak/show-progress-catching

Prevent showing and hiding progress crashes
Infomaniak · Jun 27, 2024 · 11ab8f1 · 11ab8f1
2 parents 3d6d360 + 7dc52ca
commit 11ab8f1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/BugTracker/src/main/java/com/infomaniak/lib/bugtracker/BugTrackerActivity.kt b/BugTracker/src/main/java/com/infomaniak/lib/bugtracker/BugTrackerActivity.kt
@@ -89,7 +89,7 @@ class BugTrackerActivity : AppCompatActivity() {
                 } else if (descriptionTextInput.text.isNullOrBlank() || subjectTextInput.text.isNullOrBlank()) {
                     missingFieldsError.isVisible = true
                 } else {
-                    showProgress()
+                    showProgressCatching()
                     sendBugReport()
                 }
             }
@@ -114,7 +114,7 @@ class BugTrackerActivity : AppCompatActivity() {
                 showToast(R.string.bugTrackerFormSubmitSuccess)
                 finish()
             } else {
-                submitButton.hideProgress(R.string.bugTrackerSubmit)
+                submitButton.hideProgressCatching(R.string.bugTrackerSubmit)
                 showSnackbar(R.string.bugTrackerFormSubmitError)
             }
         }

diff --git a/src/main/java/com/infomaniak/lib/core/utils/Extensions.kt b/src/main/java/com/infomaniak/lib/core/utils/Extensions.kt
@@ -68,7 +68,6 @@ import coil.ImageLoader
 import coil.load
 import com.github.razir.progressbutton.*
 import com.github.razir.progressbutton.DrawableButton.Companion.GRAVITY_CENTER
-import com.github.razir.progressbutton.hideProgress
 import com.google.android.material.button.MaterialButton
 import com.infomaniak.lib.core.models.user.User
 import com.infomaniak.lib.core.utils.CoilUtils.simpleImageLoader
@@ -120,17 +119,21 @@ fun MaterialButton.updateTextColor(color: Int?) {
     initProgress(color = color)
 }
 
-fun MaterialButton.showProgress(color: Int? = null) {
+fun MaterialButton.showProgressCatching(color: Int? = null) {
     isClickable = false
-    showProgress {
-        progressColor = color ?: Color.WHITE
-        gravity = GRAVITY_CENTER
+    // showProgress stores references to views which crashes when the view is freed
+    runCatching {
+        showProgress {
+            progressColor = color ?: Color.WHITE
+            gravity = GRAVITY_CENTER
+        }
     }
 }
 
-fun MaterialButton.hideProgress(@StringRes text: Int) {
+fun MaterialButton.hideProgressCatching(@StringRes text: Int) {
     isClickable = true
-    hideProgress(text)
+    // hideProgress stores references to views which crashes when the view is freed
+    runCatching { hideProgress(text) }
 }
 
 /**