diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 23:27:01 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 23:27:01 +0100 |
commit | dfed60f44275ed4acbde0b97d16715a044180d6c (patch) | |
tree | dfc1034795cccef52ad3469acbff07268288ec7c /OpenKeychain/src/main/java | |
parent | 01b89d1d9ca3627772866b0bea0472f658bb4e81 (diff) | |
download | open-keychain-dfed60f44275ed4acbde0b97d16715a044180d6c.tar.gz open-keychain-dfed60f44275ed4acbde0b97d16715a044180d6c.tar.bz2 open-keychain-dfed60f44275ed4acbde0b97d16715a044180d6c.zip |
re-enable contact sync by default
Diffstat (limited to 'OpenKeychain/src/main/java')
2 files changed, 3 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index f7655f569..3390fb729 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -91,7 +91,7 @@ public class KeychainApplication extends Application { // Add OpenKeychain account to Android to link contacts with keys and keyserver sync KeyserverSyncAdapterService.enableKeyserverSync(this); - ContactSyncAdapterService.initContactsSync(this); + ContactSyncAdapterService.enableContactsSync(this); // Update keyserver list as needed Preferences.getPreferences(this).upgradePreferences(this); 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(); |