diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-12-21 01:28:28 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-12-21 01:28:28 +0530 |
commit | 7d05a22ae5d55f3f088a2d3461d29911812a6dc1 (patch) | |
tree | 54cf5e95afcfa5b4a967705fcf24409fa616f69e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java | |
parent | 7baa649e47cead3ec5475997d1f6f811056b6c79 (diff) | |
download | open-keychain-7d05a22ae5d55f3f088a2d3461d29911812a6dc1.tar.gz open-keychain-7d05a22ae5d55f3f088a2d3461d29911812a6dc1.tar.bz2 open-keychain-7d05a22ae5d55f3f088a2d3461d29911812a6dc1.zip |
fixed key update preference not turning off
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java | 22 |
1 files changed, 5 insertions, 17 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 f1b4befe6..20b9c28c6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java @@ -155,22 +155,10 @@ public class ContactSyncAdapterService extends Service { } public static void enableContactsSync(Context context) { - try { - AccountManager manager = AccountManager.get(context); - Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE); - - Account account = new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE); - if (accounts.length == 0) { - if (!manager.addAccountExplicitly(account, null, null)) { - Log.d(Constants.TAG, "account already exists, the account is null, or another error occured"); - } - } - - ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1); - 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(); - } + AccountManager manager = AccountManager.get(context); + Account account = manager.getAccountsByType(Constants.ACCOUNT_TYPE)[0]; + + ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1); + ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true); } } |