diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java index d3171839..a4fc4ccf 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.List; public class ImportEntriesActivity extends AegisActivity { + private Menu _menu; private ImportEntriesAdapter _adapter; private FabScrollHelper _fabScrollHelper; @@ -70,7 +71,8 @@ public class ImportEntriesActivity extends AegisActivity { FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(v -> { - if (getApp().getVaultManager().getEntries().size() > 0) { + if (getApp().getVaultManager().getEntries().size() > 0 + && _menu.findItem(R.id.toggle_wipe_vault).isChecked()) { showWipeEntriesDialog(); } else { saveAndFinish(false); @@ -243,7 +245,8 @@ public class ImportEntriesActivity extends AegisActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_import_entries, menu); + _menu = menu; + getMenuInflater().inflate(R.menu.menu_import_entries, _menu); return true; } @@ -256,6 +259,9 @@ public class ImportEntriesActivity extends AegisActivity { case R.id.toggle_checkboxes: _adapter.toggleCheckboxes(); break; + case R.id.toggle_wipe_vault: + item.setChecked(!item.isChecked()); + break; default: return super.onOptionsItemSelected(item); } diff --git a/app/src/main/res/menu/menu_import_entries.xml b/app/src/main/res/menu/menu_import_entries.xml index fc644310..034d5d52 100644 --- a/app/src/main/res/menu/menu_import_entries.xml +++ b/app/src/main/res/menu/menu_import_entries.xml @@ -5,4 +5,8 @@ android:icon="@drawable/ic_done_all_black_24dp" android:title="@string/toggle_checkboxes" app:showAsAction="always" /> - \ No newline at end of file + +