From 788cb1550001bc0f25de29f6d63a34a7e24a1640 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 22 May 2023 13:38:04 +0100
Subject: [PATCH] Based on Play Store crash reports and stack traces, add a
 null check to try and avoid crashes

---
 .../freeyourgadget/gadgetbridge/devices/DeviceManager.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java
index b607af8df..384041c31 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java
@@ -82,7 +82,8 @@ public class DeviceManager {
                 case BLUETOOTH_DEVICE_ACTION_ALIAS_CHANGED:
                     BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                     String newName = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
-                    updateDeviceName(device, newName);
+                    if (device!=null)
+                      updateDeviceName(device, newName);
                     break;
                 case GBDevice.ACTION_DEVICE_CHANGED:
                     GBDevice dev = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);