From 72f53ef7b4b30547507a09323bc8e7e51e7288e4 Mon Sep 17 00:00:00 2001 From: stefan-niedermann Date: Wed, 29 Jan 2020 20:49:49 +0100 Subject: [PATCH] Disable synchronized return of Result on background sync --- .../notes/persistence/SyncWorker.java | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java index 707b7fd2..9289346f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java @@ -12,8 +12,6 @@ import androidx.work.WorkManager; import androidx.work.Worker; import androidx.work.WorkerParameters; -import it.niedermann.owncloud.notes.model.ISyncCallback; - import static java.util.concurrent.TimeUnit.MINUTES; public class SyncWorker extends Worker { @@ -27,26 +25,13 @@ public class SyncWorker extends Worker { @NonNull @Override - synchronized public Result doWork() { + public Result doWork() { Log.v(TAG, "Starting background synchronization"); NoteSQLiteOpenHelper db = NoteSQLiteOpenHelper.getInstance(getApplicationContext()); - db.getNoteServerSyncHelper().addCallbackPull(new ISyncCallback() { - @Override - synchronized public void onFinish() { - SyncWorker.this.notify(); - } - }); - + db.getNoteServerSyncHelper().addCallbackPull(() -> Log.v(TAG, "Finished background synchronization")); db.getNoteServerSyncHelper().scheduleSync(false); - - try { - wait(); - Log.v(TAG, "Finished background synchronization"); - return Result.success(); - } catch (InterruptedException e) { - e.printStackTrace(); - return Result.failure(); - } + // TODO return result depending on callbackPull + return Result.success(); } public static void register(@NonNull Context context) {