From 8cd6bf09a4ca23ad6cc65de301c881e12dc635dd Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 5 Dec 2015 18:56:30 +0100 Subject: [PATCH] Fix NPE when an error occurs during activity synchronization (activityDataStruct is null after handleActivityFetchFinish()) Also remove superfluous log statement -- toasts are logged as well. --- .../devices/miband/operations/FetchActivityOperation.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java index ab448543e..4bd2fcfd8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java @@ -271,6 +271,7 @@ public class FetchActivityOperation extends AbstractBTLEOperation getSupport().logMessageContent(value); } } else { + GB.toast(getContext(), "error buffering activity data: remaining bytes: " + activityStruct.activityDataRemainingBytes + ", received: " + value.length, Toast.LENGTH_LONG, GB.ERROR); try { TransactionBuilder builder = performInitialized("send stop sync data"); builder.write(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_CONTROL_POINT), new byte[]{MiBandService.COMMAND_STOP_SYNC_DATA}); @@ -279,10 +280,8 @@ public class FetchActivityOperation extends AbstractBTLEOperation handleActivityFetchFinish(); } catch (IOException e) { - e.printStackTrace(); + LOG.error("error stopping activity sync", e); } - GB.toast(getContext(), "error buffering activity data: remaining bytes: " + activityStruct.activityDataRemainingBytes + ", received: " + value.length, Toast.LENGTH_LONG, GB.ERROR); - LOG.error("error buffering activity data: remaining bytes: " + activityStruct.activityDataRemainingBytes + ", received: " + value.length); } }