From b026e1c5ef13e19ef195cde0b1aed5dd69fda9e3 Mon Sep 17 00:00:00 2001 From: Jacob Miner Date: Thu, 24 Mar 2022 16:30:17 -0700 Subject: [PATCH] Prevent crash if used in an app that has non-AppCompatActivity activities --- .../steamclock/debugmenu_ui/ComposeDebugMenuDisplay.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debugmenu-ui/src/main/java/com/steamclock/debugmenu_ui/ComposeDebugMenuDisplay.kt b/debugmenu-ui/src/main/java/com/steamclock/debugmenu_ui/ComposeDebugMenuDisplay.kt index eba2882..661b90f 100644 --- a/debugmenu-ui/src/main/java/com/steamclock/debugmenu_ui/ComposeDebugMenuDisplay.kt +++ b/debugmenu-ui/src/main/java/com/steamclock/debugmenu_ui/ComposeDebugMenuDisplay.kt @@ -33,13 +33,16 @@ class ComposeDebugMenuDisplay(app: Application) : DebugMenuDisplay { private fun monitor(application: Application) { application.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { override fun onActivityCreated(p0: Activity, p1: Bundle?) { - activityReference = WeakReference(p0 as AppCompatActivity) + val activity = p0 as? AppCompatActivity + activityReference = WeakReference(activity) } override fun onActivityStarted(p0: Activity) { - activityReference = WeakReference(p0 as AppCompatActivity) + val activity = p0 as? AppCompatActivity + activityReference = WeakReference(activity) } override fun onActivityResumed(p0: Activity) { - activityReference = WeakReference(p0 as AppCompatActivity) + val activity = p0 as? AppCompatActivity + activityReference = WeakReference(activity) } override fun onActivityPaused(p0: Activity) { activityReference = null