From 67f035accfac4554dedfae1a9d3b4109ecccf085 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 16 Apr 2017 19:43:53 +0200 Subject: [PATCH] DBHelper: no not update device attributes in db if we call getDevice() on a disconnected device Fixes NPE --- .../freeyourgadget/gadgetbridge/database/DBHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java index 22997a429..55d5bee0b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java @@ -384,7 +384,9 @@ public class DBHelper { } else { ensureDeviceUpToDate(device, gbDevice, session); } - ensureDeviceAttributes(device, gbDevice, session); + if (gbDevice.isInitialized()) { + ensureDeviceAttributes(device, gbDevice, session); + } return device; }