From aa9132b4c65dd4ee64b3b1c9f2d2876c4fc3317c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 13 Jul 2018 17:06:23 +0200 Subject: [PATCH] small NPE fix --- .../keychain/keysync/KeyserverSyncManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java index 8ce36ff9e..3506105b8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java @@ -59,12 +59,13 @@ public class KeyserverSyncManager { private static void updateKeyserverSyncSchedule(Context context, boolean forceReschedule) { Preferences prefs = Preferences.getPreferences(context); // 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) { Timber.e("WorkManager unavailable!"); return; } - workManager.cancelAllWorkByTagSync(PERIODIC_WORK_TAG); + SynchronousWorkManager synchronousWorkManager = workManager.synchronous(); + synchronousWorkManager.cancelAllWorkByTagSync(PERIODIC_WORK_TAG); if (!prefs.isKeyserverSyncEnabled()) { return; @@ -82,7 +83,7 @@ public class KeyserverSyncManager { .setConstraints(constraints.build()) .addTag(PERIODIC_WORK_TAG) .build(); - workManager.enqueueSync(workRequest); + synchronousWorkManager.enqueueSync(workRequest); prefs.setKeyserverSyncScheduled(true); }