diff options
Diffstat (limited to 'app/src/main/java/org/connectbot')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 3 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/HostListActivity.java | 37 |
2 files changed, 27 insertions, 13 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index dc1cb91..79f1269 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -508,7 +508,8 @@ public class ConsoleActivity extends Activity { } // activate consider if within x tolerance - if (Math.abs(e1.getX() - e2.getX()) < ViewConfiguration.getTouchSlop() * 4) { + int touchSlop = ViewConfiguration.get(ConsoleActivity.this).getScaledTouchSlop(); + if (Math.abs(e1.getX() - e2.getX()) < touchSlop * 4) { View flip = findCurrentView(R.id.console_flip); if (flip == null) return false; 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() { |