PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

schedule key sync work with unique name

Browse source
This commit is contained in:
Vincent Breitmoser 2020-09-05 15:10:34 +02:00
parent 8d1b81a4c9
commit aa390fadb8
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java
View file

@ -18,7 +18,6 @@
package org.sufficientlysecure.keychain.keysync; package org.sufficientlysecure.keychain.keysync;
import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -29,11 +28,10 @@ import android.os.Build.VERSION_CODES;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;
import androidx.work.Constraints.Builder; import androidx.work.Constraints.Builder;
import androidx.work.ExistingPeriodicWorkPolicy;
import androidx.work.NetworkType; import androidx.work.NetworkType;
import androidx.work.OneTimeWorkRequest; import androidx.work.OneTimeWorkRequest;
import androidx.work.PeriodicWorkRequest; import androidx.work.PeriodicWorkRequest;
import androidx.work.WorkInfo;
import androidx.work.WorkInfo.State;
import androidx.work.WorkManager; import androidx.work.WorkManager;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
import timber.log.Timber; import timber.log.Timber;
@ -43,7 +41,8 @@ public class KeyserverSyncManager {
private static final long SYNC_INTERVAL = 3; private static final long SYNC_INTERVAL = 3;
private static final TimeUnit SYNC_INTERVAL_UNIT = TimeUnit.DAYS; private static final TimeUnit SYNC_INTERVAL_UNIT = TimeUnit.DAYS;
private static final String PERIODIC_WORK_TAG = "keyserverSync"; private static final String LEGACY_PERIODIC_WORK_TAG = "keyserverSync";
private static final String WORK_UNIQUE_NAME = "periodicKeyserverSync";
public static void updateKeyserverSyncScheduleAsync(Context context, boolean forceReschedule) { public static void updateKeyserverSyncScheduleAsync(Context context, boolean forceReschedule) {
new AsyncTask<Void,Void,Void>() { new AsyncTask<Void,Void,Void>() {
@ -60,27 +59,12 @@ public class KeyserverSyncManager {
Preferences prefs = Preferences.getPreferences(context); Preferences prefs = Preferences.getPreferences(context);
WorkManager workManager = WorkManager.getInstance(context); WorkManager workManager = WorkManager.getInstance(context);
UUID workUuid = prefs.getKeyserverSyncWorkUuid(); // Cancel work that was scheduled by tag, as we used to do.
try { workManager.cancelAllWorkByTag(LEGACY_PERIODIC_WORK_TAG);
WorkInfo info = workUuid != null ? workManager.getWorkInfoById(workUuid).get() : null;
boolean workIsScheduled = info != null && info.getState() != State.CANCELLED;
if (workIsScheduled == prefs.isKeyserverSyncEnabled()) {
if (!forceReschedule) {
Timber.d("Key sync already scheduled, no changes necessary");
return;
}
Timber.d("Key sync already scheduled, but forcing reschedule");
}
} catch (ExecutionException | InterruptedException e) {
Timber.e(e, "Error getting info for scheduled key sync work?");
}
Timber.d("Cancelling sync tasks…");
workManager.cancelAllWorkByTag(PERIODIC_WORK_TAG);
if (!prefs.isKeyserverSyncEnabled()) { if (!prefs.isKeyserverSyncEnabled()) {
Timber.d("Key sync disabled"); Timber.d("Key sync disabled");
workManager.cancelUniqueWork(WORK_UNIQUE_NAME);
return; return;
} }
@ -96,10 +80,12 @@ public class KeyserverSyncManager {
PeriodicWorkRequest workRequest = PeriodicWorkRequest workRequest =
new PeriodicWorkRequest.Builder(KeyserverSyncWorker.class, SYNC_INTERVAL, SYNC_INTERVAL_UNIT) new PeriodicWorkRequest.Builder(KeyserverSyncWorker.class, SYNC_INTERVAL, SYNC_INTERVAL_UNIT)
.setConstraints(constraints.build()) .setConstraints(constraints.build())
.addTag(PERIODIC_WORK_TAG)
.build(); .build();
try { try {
workManager.enqueue(workRequest).getResult().get(); ExistingPeriodicWorkPolicy policy = forceReschedule
? ExistingPeriodicWorkPolicy.REPLACE
: ExistingPeriodicWorkPolicy.KEEP;
workManager.enqueueUniquePeriodicWork(WORK_UNIQUE_NAME, policy, workRequest).getResult().get();
Timber.d("Work id: %s", workRequest.getId()); Timber.d("Work id: %s", workRequest.getId());
prefs.setKeyserverSyncScheduled(workRequest.getId()); prefs.setKeyserverSyncScheduled(workRequest.getId());
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {