From ef8d4bae211ce7b289c0b10ebf09a830594718c5 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 18 Jun 2025 09:29:28 +0100
Subject: [PATCH] Fix NullPointerException caused by
 0acba61522df8186f3ad365028221fc70a03b7ca calling getMacAddress when
 DiscoveryActivity might not have had deviceTarget set Discovered via
 Bangle.js App Store ANR reporting

---
 .../gadgetbridge/activities/discovery/DiscoveryActivityV2.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
index 6061c28d9d..f4afabcb57 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
@@ -806,6 +806,7 @@ public class DiscoveryActivityV2 extends AbstractGBActivity implements AdapterVi
 
     @Override
     public String getMacAddress() {
+        if (deviceTarget==null) return null;
         return deviceTarget.getDevice().getAddress();
     }