MarcoBuster
/
Gadgetbridge
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge
1
0
Fork 0
Code Releases Wiki Activity

Bangle.js:actTrk: move tracksList inside class

This commit is contained in:
Ganblejs 2024-03-12 01:35:44 +01:00 committed by José Rebelo
parent 1660f4b7fa
commit d2e61c5fe8
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSActivityTrack.java
View File

@ -68,11 +68,12 @@ class BangleJSActivityTrack {
return o;
}
private static JSONArray tracksList;
static JSONArray handleActTrksList(JSONObject json, GBDevice device, Context context) throws JSONException {
stopAndRestartTimeout(device, context);
tracksList = json.getJSONArray("list");
LOG.debug("trksList says hi!");
//GB.toast(getContext(), "trksList says hi!", Toast.LENGTH_LONG, GB.INFO);
JSONArray tracksList = json.getJSONArray("list");
LOG.info("New recorder logs since last fetch: " + String.valueOf(tracksList));
if (tracksList.length()==0) {
signalFetchingEnded(device, context);
@ -95,7 +96,7 @@ class BangleJSActivityTrack {
}
private static int lastPacketCount = -1;
static JSONArray handleActTrk(JSONObject json, JSONArray tracksList, GBDevice device, Context context) throws JSONException {
static JSONArray handleActTrk(JSONObject json, GBDevice device, Context context) throws JSONException {
stopAndRestartTimeout(device, context);
JSONArray returnArray;
@ -110,7 +111,7 @@ class BangleJSActivityTrack {
if (currPacketCount != lastPacketCount+1) {
LOG.error("Activity Track Packets came out of order - aborting.");
LOG.debug("packetCount Aborting: " + lastPacketCount);
returnArray = new JSONArray().put(stopObj).put(tracksList);
returnArray = new JSONArray().put(stopObj);
signalFetchingEnded(device, context);
stopTimeoutTask();
return returnArray;
@ -125,7 +126,7 @@ class BangleJSActivityTrack {
try {
dir = FileUtils.getExternalFilesDir();
} catch (IOException e) {
returnArray = new JSONArray().put(null).put(tracksList);
returnArray = new JSONArray().put(null);
resetPacketCount();
return returnArray;
}
@ -136,13 +137,13 @@ class BangleJSActivityTrack {
if (tracksList.length()==0) {
signalFetchingEnded(device, context);
LOG.debug("packetCount reset1: " + lastPacketCount);
returnArray = new JSONArray().put(null).put(tracksList);
returnArray = new JSONArray().put(null);
} else {
JSONObject requestTrackObj = BangleJSActivityTrack.compileTrackRequest(tracksList.getString(0), 1==tracksList.length());
tracksList.remove(0);
resetPacketCount();
LOG.debug("packetCount reset2: " + lastPacketCount);
returnArray = new JSONArray().put(requestTrackObj).put(tracksList);
returnArray = new JSONArray().put(requestTrackObj);
}
} else { // We received a lines of the csv, now we append it to the file in storage.
@ -153,7 +154,7 @@ class BangleJSActivityTrack {
lastPacketCount += 1;
LOG.debug("packetCount continue: " + lastPacketCount);
returnArray = new JSONArray().put(null).put(tracksList);
returnArray = new JSONArray().put(null);
}
return returnArray;

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

@ -514,7 +514,6 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
}
}
private JSONArray tracksList;
private void handleUartRxJSON(JSONObject json) throws JSONException {
String packetType = json.getString("t");
switch (packetType) {
@ -564,17 +563,15 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
handleActivity(json);
break;
case "actTrksList":
tracksList = BangleJSActivityTrack.handleActTrksList(json, getDevice(), getContext());
JSONArray tracksList = BangleJSActivityTrack.handleActTrksList(json, getDevice(), getContext());
if (tracksList!=null) {
JSONObject requestTrackObj = BangleJSActivityTrack.compileTrackRequest(tracksList.getString(0), 1==tracksList.length());
uartTxJSON("requestActivityTrackLog", requestTrackObj);
tracksList.remove(0);
}
break;
case "actTrk":
JSONArray returnArray = BangleJSActivityTrack.handleActTrk(json, tracksList, getDevice(), getContext());
JSONArray returnArray = BangleJSActivityTrack.handleActTrk(json, getDevice(), getContext());
if (!returnArray.isNull(0)) uartTxJSON("requestActivityTrackLog", returnArray.getJSONObject(0));
tracksList = returnArray.getJSONArray(1);
break;
case "http":
handleHttp(json);