Merge pull request #109 from jklein24/confirmdisconnect

Add a confirm dialog for the disconnect all action.

2 files changed, 29 insertions, 12 deletions

diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index f0fdf16..a0d7901 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -442,27 +442,40 @@ public class HostListActivity extends ListActivity {
 	 * Disconnects all active connections and closes the activity if appropriate.
 	 */
 	private void disconnectAll() {
-		// TODO(jklein24): Show a confirm dialog before actually disconnecting.
 		if (bound == null) {
 			waitingForDisconnectAll = true;
 			return;
 		}
 
-		bound.disconnectAll(true, false);
-		updateHandler.sendEmptyMessage(-1);
-		waitingForDisconnectAll = false;
-
-		if (closeOnDisconnectAll) {
-			// Clear the intent so that the activity can be relaunched without closing.
-			// TODO(jlklein): Find a better way to do this.
-			setIntent(new Intent());
-			finish();
-		}
+		new AlertDialog.Builder(HostListActivity.this)
+			.setMessage(getString(R.string.disconnect_all_message))
+			.setPositiveButton(R.string.disconnect_all_pos, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					bound.disconnectAll(true, false);
+					updateHandler.sendEmptyMessage(-1);
+					waitingForDisconnectAll = false;
+
+					// Clear the intent so that the activity can be relaunched without closing.
+					// TODO(jlklein): Find a better way to do this.
+					setIntent(new Intent());
+
+					if (closeOnDisconnectAll) {
+						finish();
+					}
+				}
+			})
+			.setNegativeButton(R.string.disconnect_all_neg, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					waitingForDisconnectAll = false;
+					// Clear the intent so that the activity can be relaunched without closing.
+					// TODO(jlklein): Find a better way to do this.
+					setIntent(new Intent());
+				}
+			}).create().show();
 	}
 
 
 	/**
-	 * @param text
 	 * @return
 	 */
 	private boolean startConsoleActivity() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b6860a..67f478d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -425,6 +425,10 @@
 	<string name="delete_pos">"Yes, delete"</string>
 	<string name="delete_neg">"Cancel"</string>
 
+	<string name="disconnect_all_message">"Are you sure you want to disconnect from all connected hosts?"</string>
+	<string name="disconnect_all_pos">"Yes, disconnect"</string>
+	<string name="disconnect_all_neg">"Cancel"</string>
+
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">"Agree"</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->