cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small NPE fix

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-13 17:06:23 +02:00
parent acc8e82e92
commit aa9132b4c6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java
View File

@@ -59,12 +59,13 @@ public class KeyserverSyncManager {
private static void updateKeyserverSyncSchedule(Context context, boolean forceReschedule) { private static void updateKeyserverSyncSchedule(Context context, boolean forceReschedule) {
Preferences prefs = Preferences.getPreferences(context); Preferences prefs = Preferences.getPreferences(context);
// for some reason, the task is not actually scheduled sometimes unless we use the synchronous interface. // for some reason, the task is not actually scheduled sometimes unless we use the synchronous interface.
SynchronousWorkManager workManager = WorkManager.getInstance().synchronous(); WorkManager workManager = WorkManager.getInstance();
if (workManager == null) { if (workManager == null) {
Timber.e("WorkManager unavailable!"); Timber.e("WorkManager unavailable!");
return; return;
} }
workManager.cancelAllWorkByTagSync(PERIODIC_WORK_TAG); SynchronousWorkManager synchronousWorkManager = workManager.synchronous();
synchronousWorkManager.cancelAllWorkByTagSync(PERIODIC_WORK_TAG);
if (!prefs.isKeyserverSyncEnabled()) { if (!prefs.isKeyserverSyncEnabled()) {
return; return;
@@ -82,7 +83,7 @@ public class KeyserverSyncManager {
.setConstraints(constraints.build()) .setConstraints(constraints.build())
.addTag(PERIODIC_WORK_TAG) .addTag(PERIODIC_WORK_TAG)
.build(); .build();
workManager.enqueueSync(workRequest); synchronousWorkManager.enqueueSync(workRequest);
prefs.setKeyserverSyncScheduled(true); prefs.setKeyserverSyncScheduled(true);
} }