aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff options
context:
space:
mode:
authorMichal Kepkowski <michal.kepkowski@sagiton.pl>2016-04-06 19:16:10 +0200
committerMichal Kepkowski <michal.kepkowski@sagiton.pl>2016-04-06 19:16:10 +0200
commitd9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd (patch)
treea2c6bad3a5da60d4e1fcfc75f2588821d699ea01 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
parentdac5f1db08b4dea5893d9fe0a1ab0daad5b44f09 (diff)
parent88ba5688d8e110fc6676c701359bb2bbca7efb77 (diff)
downloadopen-keychain-d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd.tar.gz
open-keychain-d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd.tar.bz2
open-keychain-d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd.zip
Merge branch 'master' into okhttp3
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index e1f61a5ef..2f0ebe904 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -100,6 +100,11 @@ public class KeychainApplication extends Application {
// Add OpenKeychain account to Android to link contacts with keys and keyserver sync
createAccountIfNecessary(this);
+ if (Preferences.getKeyserverSyncEnabled(this)) {
+ // will update a keyserver sync if the interval has changed
+ KeyserverSyncAdapterService.enableKeyserverSync(this);
+ }
+
// if first time, enable keyserver and contact sync
if (Preferences.getPreferences(this).isFirstTime()) {
KeyserverSyncAdapterService.enableKeyserverSync(this);