MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-03 17:02:13 +01:00
Code Releases Wiki Activity

fix gbDevice==null errors again, and avoid spamming log with ACTION_DEVICE_CHANGED messages

Browse Source
This commit is contained in:
Gordon Williams 2022-12-12 16:10:14 +00:00
parent 6b25281a71
commit 6d35ca3ec0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -158,6 +158,8 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
/// Maximum amount of characters to store in receiveHistory /// Maximum amount of characters to store in receiveHistory
public static final int MAX_RECEIVE_HISTORY_CHARS = 100000; public static final int MAX_RECEIVE_HISTORY_CHARS = 100000;
/// Used to avoid spamming logs with ACTION_DEVICE_CHANGED messages
static String lastStateString;
// Local Intents - for app manager communication // Local Intents - for app manager communication
public static final String BANGLEJS_COMMAND_TX = "banglejs_command_tx"; public static final String BANGLEJS_COMMAND_TX = "banglejs_command_tx";
@ -215,9 +217,13 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
break; break;
} }
case GBDevice.ACTION_DEVICE_CHANGED: { case GBDevice.ACTION_DEVICE_CHANGED: {
LOG.info("ACTION_DEVICE_CHANGED " + (gbDevice!=null ? gbDevice.getStateString():"")); String stateString = (gbDevice!=null ? gbDevice.getStateString():"");
addReceiveHistory("\n================================================\nACTION_DEVICE_CHANGED "+gbDevice.getStateString()+" "+(new SimpleDateFormat("yyyy-mm-dd hh:mm:ss", Locale.US)).format(Calendar.getInstance().getTime())+"\n================================================\n"); if (!stateString.equals(lastStateString)) {
if (gbDevice.getState() == GBDevice.State.NOT_CONNECTED) { lastStateString = stateString;
LOG.info("ACTION_DEVICE_CHANGED " + stateString);
addReceiveHistory("\n================================================\nACTION_DEVICE_CHANGED "+stateString+" "+(new SimpleDateFormat("yyyy-mm-dd hh:mm:ss", Locale.US)).format(Calendar.getInstance().getTime())+"\n================================================\n");
}
if (gbDevice!=null && gbDevice.getState() == GBDevice.State.NOT_CONNECTED) {
stopLocationUpdate(); stopLocationUpdate();
} }
} }