diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-03 22:45:38 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-03 22:45:38 +0100 |
| commit | 556c04db829c7e7534d03e8eb101a13d2cab6503 (patch) | |
| tree | fd4d8798bfcbf70d686759b524036e9d74d40f75 | |
| parent | 1cbecb1b3ba581c3ede9f37d2dd5f86c60fde986 (diff) | |
| parent | e422b3af045768e64c555e33ea333e3712adc378 (diff) | |
| download | open-keychain-556c04db829c7e7534d03e8eb101a13d2cab6503.tar.gz open-keychain-556c04db829c7e7534d03e8eb101a13d2cab6503.tar.bz2 open-keychain-556c04db829c7e7534d03e8eb101a13d2cab6503.zip | |
Merge pull request #1743 from advaita13/master
Contact Synchronisation Notification
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java | 7 |
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); |