gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue with all events being uploaded as WARNING type even if they contain ALARM events. Fixes #37

Browse Source
This commit is contained in:
Graham Jones
2022-03-10 20:43:30 +00:00
parent 7d307529b4
commit fcbd8e95e0
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/uk/org/openseizuredetector/LogManager.java
View File

@@ -661,7 +661,11 @@ public class LogManager {
//int eventId = -1; //int eventId = -1;
Log.v(TAG, "uploadSdData()"); Log.v(TAG, "uploadSdData()");
// First try uploading full alarms, and only if we do not have any of those, upload warnings. // First try uploading full alarms, and only if we do not have any of those, upload warnings.
getNextEventToUpload(true, (Long eventId) -> { boolean warningsArr[] = { false, true };
for (int n=0; n<warningsArr.length; n++) {
boolean warningsVal = warningsArr[n];
Log.i(TAG, "uploadSdData(): warningsVal=" + warningsVal);
getNextEventToUpload(warningsVal, (Long eventId) -> {
if (eventId != -1) { if (eventId != -1) {
Log.v(TAG, "uploadSdData() - eventId=" + eventId); Log.v(TAG, "uploadSdData() - eventId=" + eventId);
String eventJsonStr = getDatapointById(eventId); String eventJsonStr = getDatapointById(eventId);
@@ -699,6 +703,7 @@ public class LogManager {
} }
}); });
} }
}
// Mark the relevant member variables to show we are not currently doing an upload, so a new one can be // Mark the relevant member variables to show we are not currently doing an upload, so a new one can be