Fix possible crash in SafeBroadcastReceiver

Nain57 · Jan 11, 2025 · ddc75ef · ddc75ef
1 parent efcac3f
commit ddc75ef
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.../common/base/src/main/java/com/buzbuz/smartautoclicker/core/base/SafeBroadcastReceiver.kt b/.../common/base/src/main/java/com/buzbuz/smartautoclicker/core/base/SafeBroadcastReceiver.kt
@@ -29,8 +29,6 @@ abstract class SafeBroadcastReceiver(private val intentFilter: IntentFilter) : B
         get() = registrationContext != null
 
     fun register(context: Context, exported: Boolean = true) {
-        if (isRegistered) return
-
         registrationContext = context
         ContextCompat.registerReceiver(
             context,
@@ -43,11 +41,13 @@ abstract class SafeBroadcastReceiver(private val intentFilter: IntentFilter) : B
     }
 
     fun unregister() {
-        if (!isRegistered) return
+        try {
+            registrationContext?.unregisterReceiver(this)
+        } catch (iaEx: IllegalArgumentException) {
+            return
+        }
 
-        registrationContext!!.unregisterReceiver(this)
         registrationContext = null
-
         onUnregistered()
     }