diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0afeaad4..631699b5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java index 4b974b68..95af7de5 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java @@ -37,6 +37,13 @@ public class AboutActivity extends AegisActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + if (android.os.Build.VERSION.SDK_INT < 21) { + Toast.makeText(this, "About screen is not supported on this device.", Toast.LENGTH_LONG).show(); + finish(); + return; + } + if (abortIfOrphan(savedInstanceState)) { return; } diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java index fd453b50..932593b5 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java @@ -981,6 +981,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene _menu = menu; getMenuInflater().inflate(R.menu.menu_main, menu); + if (android.os.Build.VERSION.SDK_INT < 21) { + menu.findItem(R.id.action_about).setVisible(false); + } + updateLockIcon(); updateSortCategoryMenu(); @@ -1057,8 +1061,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene if (itemId == R.id.action_settings) { startPreferencesActivity(); } else if (itemId == R.id.action_about) { - Intent intent = new Intent(this, AboutActivity.class); - startActivity(intent); + if (android.os.Build.VERSION.SDK_INT >= 21) { + Intent intent = new Intent(this, AboutActivity.class); + startActivity(intent); + } } else if (itemId == R.id.action_lock) { _vaultManager.lock(true); } else {