Disable onBackPressed when components are destroyed

basshelal · Jul 29, 2019 · 57323a6 · 57323a6
1 parent 1ca4517
commit 57323a6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/...ker/src/main/java/com/github/basshelal/unsplashpicker/presentation/PhotoPickerFragment.kt b/...ker/src/main/java/com/github/basshelal/unsplashpicker/presentation/PhotoPickerFragment.kt
@@ -60,6 +60,12 @@ class PhotoPickerFragment
             ?.commit()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+
+        onBackPressed.isEnabled = false
+    }
+
     companion object {
         const val TAG = "UnsplashPhotoPickerFragment"
 

diff --git a/...icker/src/main/java/com/github/basshelal/unsplashpicker/presentation/PhotoShowFragment.kt b/...icker/src/main/java/com/github/basshelal/unsplashpicker/presentation/PhotoShowFragment.kt
@@ -134,6 +134,12 @@ public class PhotoShowFragment : Fragment() {
             ?.commit()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+
+        onBackPressed.isEnabled = false
+    }
+
     companion object {
         const val TAG = "UnsplashPhotoPickerPhotoShowFragment"
         private const val PHOTO = "PHOTO"

diff --git a/...ker/src/main/java/com/github/basshelal/unsplashpicker/presentation/UnsplashPhotoPicker.kt b/...ker/src/main/java/com/github/basshelal/unsplashpicker/presentation/UnsplashPhotoPicker.kt
@@ -92,6 +92,16 @@ public class UnsplashPhotoPicker
         }
     }
 
+    // When the user has searched something, a back press will clear the selection
+    val onBackPressed = object : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+            if (this@UnsplashPhotoPicker.search_editText?.text?.isNotBlank() == true) {
+                clearSelectedPhotos()
+                this@UnsplashPhotoPicker.search_editText?.text = SpannableStringBuilder("")
+            }
+        }
+    }
+
     //endregion Privates
 
     //region Public API
@@ -348,15 +358,6 @@ public class UnsplashPhotoPicker
         searchCardView?.isVisible = hasSearch
         searchEditText?.hint = searchHint
 
-        // When the user has searched something, a back press will clear the selection
-        val onBackPressed = object : OnBackPressedCallback(false) {
-            override fun handleOnBackPressed() {
-                if (this@UnsplashPhotoPicker.search_editText?.text?.isNotBlank() == true) {
-                    clearSelectedPhotos()
-                    this@UnsplashPhotoPicker.search_editText?.text = SpannableStringBuilder("")
-                }
-            }
-        }
         activity.onBackPressedDispatcher.addCallback(onBackPressed)
 
         adapter = UnsplashPhotoAdapter(
@@ -598,6 +599,14 @@ public class UnsplashPhotoPicker
         }
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        // If the caller destroyed this View when the search bar was full
+        // we must disable the onBackPressed to avoid "empty" back presses
+        onBackPressed.isEnabled = false
+    }
+
     //endregion Private functions
 }