potencial NPE fix willowtreeapps#231

v-mas · Nov 8, 2023 · f93ab77 · f93ab77
1 parent f81c48e
commit f93ab77
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/HyperionService.java b/hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/HyperionService.java
@@ -132,10 +132,13 @@ final class OpenMenuReceiver extends BroadcastReceiver {
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            final Activity activity = HyperionService.this.activity.get();
-            if (activity != null) {
-                AppComponent.Holder.getInstance(HyperionService.this)
-                        .getPublicControl().open(activity);
+            WeakReference<Activity> ref = HyperionService.this.activity;
+            if (ref != null) {
+                final Activity activity = ref.get();
+                if (activity != null) {
+                    AppComponent.Holder.getInstance(HyperionService.this)
+                            .getPublicControl().open(activity);
+                }
             }
         }
     }