From 63ce6654542f12e8bad4eadff5c1250262581453 Mon Sep 17 00:00:00 2001 From: Arthur Hsu Date: Thu, 7 Jan 2016 15:06:09 -0800 Subject: Add DisconnectAll to HostActivity's Options. Fix https://github.com/connectbot/connectbot/issues/176 --- .../main/java/org/connectbot/HostListActivity.java | 36 +++++++++++++++------- app/src/main/res/values/strings.xml | 1 + 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 3a7a383..62178fc 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -17,17 +17,6 @@ package org.connectbot; -import java.util.List; - -import org.connectbot.bean.HostBean; -import org.connectbot.data.HostStorage; -import org.connectbot.service.OnHostStatusChangedListener; -import org.connectbot.service.TerminalBridge; -import org.connectbot.service.TerminalManager; -import org.connectbot.transport.TransportFactory; -import org.connectbot.util.HostDatabase; -import org.connectbot.util.PreferenceConstants; - import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -59,6 +48,17 @@ import android.widget.AdapterView; import android.widget.ImageView; import android.widget.TextView; +import org.connectbot.bean.HostBean; +import org.connectbot.data.HostStorage; +import org.connectbot.service.OnHostStatusChangedListener; +import org.connectbot.service.TerminalBridge; +import org.connectbot.service.TerminalManager; +import org.connectbot.transport.TransportFactory; +import org.connectbot.util.HostDatabase; +import org.connectbot.util.PreferenceConstants; + +import java.util.List; + public class HostListActivity extends AppCompatListActivity implements OnHostStatusChangedListener { public final static String TAG = "CB.HostListActivity"; public static final String DISCONNECT_ACTION = "org.connectbot.action.DISCONNECT"; @@ -77,6 +77,8 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta private MenuItem sortlast; + private MenuItem disconnectall; + private SharedPreferences prefs = null; protected boolean makingShortcut = false; @@ -233,6 +235,7 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta sortcolor.setVisible(!sortedByColor); sortlast.setVisible(sortedByColor); + disconnectall.setEnabled(bound.getBridges().size() > 0); return true; } @@ -273,6 +276,17 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta colors.setIcon(android.R.drawable.ic_menu_slideshow); colors.setIntent(new Intent(HostListActivity.this, ColorsActivity.class)); + disconnectall = menu.add(R.string.list_menu_disconnect); + disconnectall.setIcon(android.R.drawable.ic_menu_delete); + final HostListActivity self = this; + disconnectall.setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem menuItem) { + self.disconnectAll(); + return false; + } + }); + MenuItem settings = menu.add(R.string.list_menu_settings); settings.setIcon(android.R.drawable.ic_menu_preferences); settings.setIntent(new Intent(HostListActivity.this, SettingsActivity.class)); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 45ef38c..f11da40 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -432,6 +432,7 @@ "Sort by color" "Sort by name" + "Disconnect All" "Settings" "Disconnect" -- cgit v1.2.3