moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 03:02:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #1155 from adithyaphilip/development

Browse Source 
Removed JellyBean restriction on Contact Sync
This commit is contained in:
Dominik Schürmann 2015-03-17 14:56:31 +01:00
commit 53d7c1f533
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
View File

@ -118,24 +118,21 @@ public class KeychainApplication extends Application {
* @param context * @param context
*/ */
public static void setupAccountAsNeeded(Context context) { public static void setupAccountAsNeeded(Context context) {
// only enabled for Jelly Bean because we need some newer methods in our sync adapter try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { AccountManager manager = AccountManager.get(context);
try { Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE);
AccountManager manager = AccountManager.get(context); if (accounts == null || accounts.length == 0) {
Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE); Account account = new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE);
if (accounts == null || accounts.length == 0) { if (manager.addAccountExplicitly(account, null, null)) {
Account account = new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE); ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
if (manager.addAccountExplicitly(account, null, null)) { ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1); } else {
ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true); Log.e(Constants.TAG, "Adding account failed!");
} else {
Log.e(Constants.TAG, "Adding account failed!");
}
} }
} catch (SecurityException e) {
Log.e(Constants.TAG, "SecurityException when adding the account", e);
Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show();
} }
} catch (SecurityException e) {
Log.e(Constants.TAG, "SecurityException when adding the account", e);
Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show();
} }
} }