Merge pull request #1155 from adithyaphilip/development

Removed JellyBean restriction on Contact Sync
This commit is contained in:
Dominik Schürmann 2015-03-17 14:56:31 +01:00
commit 53d7c1f533

View File

@ -118,8 +118,6 @@ 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
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
try { try {
AccountManager manager = AccountManager.get(context); AccountManager manager = AccountManager.get(context);
Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE); Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE);
@ -137,7 +135,6 @@ public class KeychainApplication extends Application {
Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show(); Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show();
} }
} }
}
static void brandGlowEffect(Context context, int brandColor) { static void brandGlowEffect(Context context, int brandColor) {
// no hack on Android 5 // no hack on Android 5