demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Sync fixes

Browse Source 
- Give stress its own sync flag
- Fix inverted logic for isSyncActive
- Add more info to logs
This commit is contained in:
Martin.JM
2025-08-15 22:10:03 +02:00
parent e34f635943
commit 13a26af518
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+4 -2
View File
@@ -2962,6 +2962,8 @@ public class HuaweiSupportProvider {
if (!getHuaweiCoordinator().supportsAutoStress())
return false;
syncState.setStressSync(true);
huaweiFileDownloadManager.addToQueue(HuaweiFileDownloadManager.FileRequest.rriFileRequest(
getHuaweiCoordinator().getSupportsRriNewSync(),
start,
@@ -2988,13 +2990,13 @@ public class HuaweiSupportProvider {
} else {
LOG.debug("Stress file empty");
}
syncState.stopActivitySync();
syncState.setStressSync(false);
}
@Override
public void downloadException(HuaweiFileDownloadManager.HuaweiFileDownloadException e) {
super.downloadException(e);
syncState.stopActivitySync();
syncState.setStressSync(false);
}
}
), true);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSyncState.java
+36 -6
View File
@@ -19,6 +19,7 @@ class HuaweiSyncState {
private boolean activitySync = false;
private boolean p2pSync = false;
private boolean stressSync = false;
private boolean workoutSync = false;
private int workoutGpsDownload = 0;
@@ -27,7 +28,25 @@ class HuaweiSyncState {
}
private boolean isSyncActive() {
return !activitySync && !p2pSync && !workoutSync && workoutGpsDownload == 0;
return activitySync || p2pSync || stressSync || workoutSync || workoutGpsDownload != 0;
}
private String activeSync() {
StringBuilder retv = new StringBuilder();
if (activitySync)
retv.append("activitySync,");
if (p2pSync)
retv.append("p2pSync,");
if (stressSync)
retv.append("stressSync,");
if (workoutSync)
retv.append("workoutSync,");
if (workoutGpsDownload != 0) {
retv.append("workoutGpsDownload:");
retv.append(workoutGpsDownload);
retv.append(",");
}
return retv.toString();
}
public void addActivitySyncToQueue() {
@@ -55,7 +74,7 @@ class HuaweiSyncState {
public boolean startActivitySync() {
synchronized(this) {
if (isSyncActive()) {
LOG.warn("Attempted to start activity sync while another sync is still active");
LOG.warn("Attempted to start activity sync while another sync is still active: {}", activeSync());
return false;
}
this.activitySync = true;
@@ -67,7 +86,7 @@ class HuaweiSyncState {
public void stopActivitySync() {
LOG.debug("Set activity sync state to false");
this.activitySync = false;
if (!p2pSync) {
if (!p2pSync && !this.stressSync) {
this.syncQueue.remove((Integer) RecordedDataTypes.TYPE_ACTIVITY);
supportProvider.fetchRecodedDataFromQueue();
}
@@ -78,7 +97,18 @@ class HuaweiSyncState {
// We cannot do the syncActive check for the P2P sync as it runs in parallel with the activity sync
LOG.debug("Set p2p sync state to {}", state);
this.p2pSync = state;
if (!state && !this.activitySync) {
if (!state && !this.activitySync && !this.stressSync) {
this.syncQueue.remove((Integer) RecordedDataTypes.TYPE_ACTIVITY);
supportProvider.fetchRecodedDataFromQueue();
}
updateState();
}
public void setStressSync(boolean state) {
// We cannot do the syncActive check for the stress sync as it runs in parallel with the activity sync (sleep file specifically)
LOG.debug("Set stress sync state to {}", state);
this.stressSync = state;
if (!state && !this.activitySync && !this.p2pSync) {
this.syncQueue.remove((Integer) RecordedDataTypes.TYPE_ACTIVITY);
supportProvider.fetchRecodedDataFromQueue();
}
@@ -88,7 +118,7 @@ class HuaweiSyncState {
public boolean startWorkoutSync() {
synchronized (this) {
if (isSyncActive()) {
LOG.warn("Attempted to start workout sync while another sync is still active");
LOG.warn("Attempted to start workout sync while another sync is still active: {}", activeSync());
return false;
}
this.workoutSync = true;
@@ -100,7 +130,7 @@ class HuaweiSyncState {
public void stopWorkoutSync() {
LOG.debug("Set workout sync state to false");
this.workoutSync = false;
if (workoutGpsDownload != 0) {
if (workoutGpsDownload == 0) {
this.syncQueue.remove((Integer) RecordedDataTypes.TYPE_GPS_TRACKS);
supportProvider.fetchRecodedDataFromQueue();
}