don't ask for list deletion in case of empty list, fixes #277

1 files changed, 20 insertions, 8 deletions

diff --git a/src/cgeo/geocaching/cgeocaches.java b/src/cgeo/geocaching/cgeocaches.java
index 495eed7..40b379f 100644
--- a/src/cgeo/geocaching/cgeocaches.java
+++ b/src/cgeo/geocaching/cgeocaches.java
@@ -2475,21 +2475,33 @@ public class cgeocaches extends AbstractListActivity {
 		alert.show();
 	}
 
+	private void removeListInternal() {
+		boolean status = app.removeList(listId);
+
+		if (status) {
+			showToast(res.getString(R.string.list_dialog_remove_ok));
+			switchListById(1);
+		} else {
+			showToast(res.getString(R.string.list_dialog_remove_err));
+		}
+	}
+
 	private void removeList() {
+		// if there are no caches on this list, don't bother the user with questions.
+		// there is no harm in deleting the list, he could recreate it easily
+		if (cacheList != null && cacheList.isEmpty()) {
+			removeListInternal();
+			return;
+		}
+
+		// ask him, if there are caches on the list
 		final AlertDialog.Builder alert = new AlertDialog.Builder(this);
 
 		alert.setTitle(R.string.list_dialog_remove_title);
 		alert.setMessage(R.string.list_dialog_remove_description);
 		alert.setPositiveButton(R.string.list_dialog_remove, new DialogInterface.OnClickListener() {
 			public void onClick(DialogInterface dialog, int whichButton) {
-				boolean status = app.removeList(listId);
-
-				if (status) {
-					showToast(res.getString(R.string.list_dialog_remove_ok));
-					switchListById(1);
-				} else {
-					showToast(res.getString(R.string.list_dialog_remove_err));
-				}
+				removeListInternal();
 			}
 		});
 		alert.setNegativeButton(res.getString(R.string.list_dialog_cancel), new DialogInterface.OnClickListener() {