From 7734fbe4b07895ec0cce7f2a180390f2a9fe49e7 Mon Sep 17 00:00:00 2001
From: Ganblejs <geatre+codeberg@gmail.com>
Date: Wed, 6 Mar 2024 12:04:25 +0100
Subject: [PATCH] Revert "Bangle.js:actTrk:fetch all logs, then parse them"

This reverts commit 6b941f9277f70d642cfaa430d3d917ba6b559d17.
---
 .../banglejs/BangleJSActivityTrack.java       | 22 +++----------------
 .../banglejs/BangleJSDeviceSupport.java       |  8 +++----
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSActivityTrack.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSActivityTrack.java
index 2d9582af1..df0e45f2c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSActivityTrack.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSActivityTrack.java
@@ -58,15 +58,6 @@ class BangleJSActivityTrack extends BangleJSDeviceSupport {
         GB.toast(context.getString(R.string.activity_detail_end_label) + " : " + context.getString(R.string.busy_task_fetch_sports_details), Toast.LENGTH_SHORT, GB.INFO);
     }
 
-    static JSONArray makeDeepCopyOfJSONArray(JSONArray tracksList) throws JSONException {
-        JSONArray tracksListIntact = new JSONArray();
-        String[] tmpTracksList = tracksList.join(",").replace("\"","").split(","); // Hacky way to get a sort of deep copy.
-        for (int i = 0; i<tmpTracksList.length; i++) {
-            tracksListIntact.put(tmpTracksList[i]);
-        }
-        return tracksListIntact;
-    }
-
     private static Timer timeout;
     private static TimerTask timeoutTask;
 
@@ -195,7 +186,7 @@ class BangleJSActivityTrack extends BangleJSDeviceSupport {
        return o; 
     }
 
-    static JSONArray handleActTrk(JSONObject json, JSONArray tracksList, JSONArray tracksListIntact, int prevPacketCount, GBDevice device, Context context) throws JSONException {
+    static JSONArray handleActTrk(JSONObject json, JSONArray tracksList, int prevPacketCount, GBDevice device, Context context) throws JSONException {
         stopAndRestartTimeout(device, context);
 
         JSONArray returnArray;
@@ -230,14 +221,8 @@ class BangleJSActivityTrack extends BangleJSDeviceSupport {
 
         if (!json.has("lines")) { // if no lines were sent with this json object, it signifies that the whole recorder log has been transmitted.
             setLatestFetchedRecorderLog(dir, log);
-            if (tracksList.length()==0) { // All data from all Recorder logs have been fetched.
-                LOG.warn("tracksListIntact:\n" + tracksListIntact);
-                for (int i = 0; i<tracksListIntact.length(); i++){
-                    String currLog = tracksListIntact.getString(i);
-                    LOG.info("currLog: " + currLog);
-                    String currFilename = "recorder.log" + currLog + ".csv";
-                    parseFetchedRecorderCSV(dir, currFilename, currLog, device, context);
-                }
+            parseFetchedRecorderCSV(dir, filename, log, device, context); // TODO: Parsing could be done after we fetched all recorder logs instead, making the fetching quicker and maybe less prone to user errors.
+            if (tracksList.length()==0) {
                 signalFetchingEnded(device, context);
                 int resetPacketCount = -1;
                 LOG.info("packetCount reset1: " + resetPacketCount);
@@ -245,7 +230,6 @@ class BangleJSActivityTrack extends BangleJSDeviceSupport {
             } else {
                 JSONObject requestTrackObj = BangleJSActivityTrack.compileTrackRequest(tracksList.getString(0), 1==tracksList.length());
                 tracksList.remove(0);
-                LOG.warn("tracksListIntact2:\n" + tracksListIntact);
                 int resetPacketCount = -1;
                 LOG.info("packetCount reset2: " + resetPacketCount);
                 returnArray = new JSONArray().put(requestTrackObj).put(tracksList).put(resetPacketCount);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index 9f496fc46..7a3496c92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -514,9 +514,8 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         }
     }
 
-    private JSONArray tracksList;
-    private JSONArray tracksListIntact;
-    private int packetCount;
+    JSONArray tracksList;
+    int packetCount;
     private void handleUartRxJSON(JSONObject json) throws JSONException {
         String packetType = json.getString("t");
         switch (packetType) {
@@ -570,14 +569,13 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 if (tracksList!=null) {
                     JSONObject requestTrackObj = BangleJSActivityTrack.compileTrackRequest(tracksList.getString(0), 1==tracksList.length());
                     uartTxJSON("requestActivityTrackLog", requestTrackObj);
-                    tracksListIntact = BangleJSActivityTrack.makeDeepCopyOfJSONArray(tracksList);
                     tracksList.remove(0);
                     packetCount = -1;
                 }
                 break;
             case "actTrk":
                 LOG.info("packetCount1: " + packetCount);
-                JSONArray returnArray = BangleJSActivityTrack.handleActTrk(json, tracksList, tracksListIntact, packetCount, getDevice(), getContext());
+                JSONArray returnArray = BangleJSActivityTrack.handleActTrk(json, tracksList, packetCount, getDevice(), getContext());
                 if (!returnArray.isNull(0)) uartTxJSON("requestActivityTrackLog", returnArray.getJSONObject(0));
                 tracksList = returnArray.getJSONArray(1);
                 packetCount = returnArray.getInt(2);