From f93ab77352b6eb030ada9c850fe853fdc115c79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Golonka?= Date: Wed, 8 Nov 2023 23:42:32 +0100 Subject: [PATCH] potencial NPE fix #231 --- .../hyperion/core/internal/HyperionService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 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 index 402fc55..b2c675a 100644 --- 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 ref = HyperionService.this.activity; + if (ref != null) { + final Activity activity = ref.get(); + if (activity != null) { + AppComponent.Holder.getInstance(HyperionService.this) + .getPublicControl().open(activity); + } } } }