From 648bd66ba4fb079f87bc794cc4ff0aff4e41dec0 Mon Sep 17 00:00:00 2001 From: Fawkes100 Date: Sun, 19 Jan 2025 20:17:53 +0100 Subject: [PATCH] FIXME: Deadlock on Modified Song Syncing --- .../notevault/network/sync/SongSyncModule.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java b/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java index d048963..b92a087 100644 --- a/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java +++ b/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java @@ -66,13 +66,17 @@ public class SongSyncModule { public void uploadModifiedNoteSheets() { songSyncRepository.loadModifiedNoteSheets(modifiedNoteSheets -> { - songSyncService.uploadModifiedNoteSheets(modifiedNoteSheets, new SongSyncService.UploadNoteSheetCallback() { - @Override - public void finishUploadNoteSheets(List uploadResponses) { - songSyncRepository.markModifiedNoteSheetsAsSynced(uploadResponses); - syncViewModel.finishModifiedSongSyncinc(); - } - }); + if(modifiedNoteSheets.isEmpty()) { + syncViewModel.finishModifiedSongSyncinc(); + } else { + songSyncService.uploadModifiedNoteSheets(modifiedNoteSheets, new SongSyncService.UploadNoteSheetCallback() { + @Override + public void finishUploadNoteSheets(List uploadResponses) { + songSyncRepository.markModifiedNoteSheetsAsSynced(uploadResponses); + syncViewModel.finishModifiedSongSyncinc(); + } + }); + } }); }