aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorAdvaita <adipandya@gmail.com>2016-03-03 01:52:21 +0530
committerAdvaita <adipandya@gmail.com>2016-03-03 01:52:21 +0530
commite422b3af045768e64c555e33ea333e3712adc378 (patch)
tree3dc6f60ef4526b05c27b724244d4f06a7e591b36 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent4b3d584d1e3328565b918e437e073700ca797202 (diff)
downloadopen-keychain-e422b3af045768e64c555e33ea333e3712adc378.tar.gz
open-keychain-e422b3af045768e64c555e33ea333e3712adc378.tar.bz2
open-keychain-e422b3af045768e64c555e33ea333e3712adc378.zip
Update ContactSyncAdapterService.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
index cdfe2f1ce..15f8a47db 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -143,6 +143,13 @@ public class ContactSyncAdapterService extends Service {
}
public static void requestContactsSync() {
+ // if user has disabled automatic sync, do nothing
+ if (!ContentResolver.getSyncAutomatically(
+ new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE),
+ ContactsContract.AUTHORITY)) {
+ return;
+ }
+
Bundle extras = new Bundle();
// no need to wait, do it immediately
extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);