check activity availability before showing a dialog

OneSignal · Oct 30, 2024 · eb9fc87 · eb9fc87
1 parent c0ab9c8
commit eb9fc87
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/...in/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt b/...in/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt
@@ -56,18 +56,21 @@ object AlertDialogPrepromptForAndroidSettings {
         // simulate showing a dialog in a finishing activity
         activity.finish()
 
-        AlertDialog.Builder(activity)
-            .setTitle(title)
-            .setMessage(message)
-            .setPositiveButton(R.string.permission_not_available_open_settings_option) { dialog, which ->
-                callback.onAccept()
-            }
-            .setNegativeButton(android.R.string.no) { dialog, which ->
-                callback.onDecline()
-            }
-            .setOnCancelListener {
-                callback.onDecline()
-            }
-            .show()
+        // ensure the activity that will be showing the dialog is available
+        if (activity != null && !activity.isFinishing) {
+            AlertDialog.Builder(activity)
+                .setTitle(title)
+                .setMessage(message)
+                .setPositiveButton(R.string.permission_not_available_open_settings_option) { dialog, which ->
+                    callback.onAccept()
+                }
+                .setNegativeButton(android.R.string.no) { dialog, which ->
+                    callback.onDecline()
+                }
+                .setOnCancelListener {
+                    callback.onDecline()
+                }
+                .show()
+        }
     }
 }