From 7f3eec47ecbee4525aac7e684c0e5733c862f548 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 28 Feb 2026 19:49:40 +0100
Subject: [PATCH] Pebble: Fix crash when returning from exernal website from
 browser application.

---
 .../gadgetbridge/activities/ExternalPebbleJSActivity.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index baff788d67..d9e42fc1d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -70,7 +70,7 @@ public class ExternalPebbleJSActivity extends AbstractGBActivity {
         UUID currentUUID = null;
         GBDevice currentDevice = null;
 
-        if (extras == null) {
+        if (extras == null || (extras.getParcelable(GBDevice.EXTRA_DEVICE) == null)) {
             confUri = getIntent().getData();
             if(confUri.getScheme().equals("gadgetbridge")) {
                 try {