aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java8
1 files changed, 2 insertions, 6 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 a1c652245..94742fe18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -152,7 +152,7 @@ public class ContactSyncAdapterService extends Service {
extras);
}
- public static void initContactsSync(Context context) {
+ public static void enableContactsSync(Context context) {
try {
AccountManager manager = AccountManager.get(context);
Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE);
@@ -165,11 +165,7 @@ public class ContactSyncAdapterService extends Service {
}
ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
-
- // Enable by default for Android < 6, on Android >= 6 runtime permissions are required
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
- ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
- }
+ ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
} catch (SecurityException e) {
Log.e(Constants.TAG, "SecurityException when adding the account", e);
Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show();