From 7c4e6a11e17a1157ec1045930f08dd78d65619f5 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 15 Feb 2017 17:30:47 +0000 Subject: [PATCH] Disallow deleting the last collection. --- .../java/at/bitfire/davdroid/ui/AccountActivity.java | 11 ++++++++++- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java index 94beb50b..c04750f7 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java @@ -236,7 +236,16 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { case R.id.delete_collection: - DeleteCollectionFragment.ConfirmDeleteCollectionFragment.newInstance(account, info).show(getSupportFragmentManager(), null); + if (adapter.getCount() == 1) { + new AlertDialog.Builder(AccountActivity.this) + .setIcon(R.drawable.ic_error_dark) + .setTitle(R.string.account_delete_collection_last_title) + .setMessage(R.string.account_delete_collection_last_text) + .setPositiveButton(android.R.string.ok, null) + .show(); + } else { + DeleteCollectionFragment.ConfirmDeleteCollectionFragment.newInstance(account, info).show(getSupportFragmentManager(), null); + } break; } return true; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 96d5eb31..cdf394db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -108,6 +108,8 @@ Create new address book Refresh calendar list Create new calendar + Can\'t delete last collection + Deleting the last collection is not allowed, please create a new one if you\'d like to delete this one. EteSync permissions