diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java index 477c649b..ae537d32 100644 --- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java +++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java @@ -129,21 +129,6 @@ public class MainActivity extends BaseActivity startActivityForResult(introIntent, Constants.INTENT_MAIN_INTRO); } - private void showAndroid21DeprecationNotice() { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.dialog_title_android21_depreaction) - .setMessage(R.string.dialog_msg_android21_deprecation) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - settings.setAndroid21DeprecationNoticeShown(true); - } - }) - .setCancelable(false) - .create() - .show(); - } - public void authenticate(int messageId) { AuthMethod authMethod = settings.getAuthMethod(); @@ -220,10 +205,6 @@ public class MainActivity extends BaseActivity showFirstTimeWarning(); } - if (!settings.getAndroid21DeprecationNoticeShown()) { - showAndroid21DeprecationNotice(); - } - speedDial = findViewById(R.id.speedDial); speedDial.inflate(R.menu.menu_fab); diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java index e42609b9..539537b2 100644 --- a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java +++ b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java @@ -371,14 +371,6 @@ public class Settings { setBoolean(R.string.settings_key_security_backup_warning, value); } - public boolean getAndroid21DeprecationNoticeShown() { - return getBoolean(R.string.settings_key_android21_deprecation_notice_shown, false); - } - - public void setAndroid21DeprecationNoticeShown(boolean value) { - setBoolean(R.string.settings_key_android21_deprecation_notice_shown, value); - } - public boolean getSpecialFeatures() { return getBoolean(R.string.settings_key_special_features, false); } diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml index cdb0a5c0..f29221c4 100644 --- a/app/src/main/res/values/settings.xml +++ b/app/src/main/res/values/settings.xml @@ -64,7 +64,7 @@ pref_clear_keystore pref_last_used_dialog_shown - pref_android21_deprecation_notice_shown + pref_android21_deprecation_notice_shown 30 diff --git a/app/src/main/res/values/strings_main.xml b/app/src/main/res/values/strings_main.xml index b54cc097..1436472a 100644 --- a/app/src/main/res/values/strings_main.xml +++ b/app/src/main/res/values/strings_main.xml @@ -85,7 +85,6 @@ Tokens usage KeyStore error QR Code - Deprecation notice Enter password @@ -103,12 +102,6 @@ Any entries that are added will get lost.\n\nTo still be able to use andOTP you can go to the Settings and switch the Database encryption to Password / PIN. - This will be the last version of andOTP to - support Android versions below 5.1 (Lollipop). The increased effort required to maintain a - separate storage implementation just for those older versions as well as their low market - shares make a continued support infeasible for our small team.\n\nThis message will not be - shown again. - Scan QR code Import QR code