aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-08-29 11:10:43 -0700
committerKenny Root <kenny@the-b.org>2015-08-29 11:10:45 -0700
commit3e1d891d71412f18b872fc6a08817638f86b0e35 (patch)
treedac26109f607129f0c84f4288d15eeb6acd83533 /app
parent8b181e9087b292dd6311ea2939393cd9493147e6 (diff)
downloadconnectbot-3e1d891d71412f18b872fc6a08817638f86b0e35.tar.gz
connectbot-3e1d891d71412f18b872fc6a08817638f86b0e35.tar.bz2
connectbot-3e1d891d71412f18b872fc6a08817638f86b0e35.zip
Add host status change listener
This fixes a problem where the 'Disconnect' context menu item in the HostListActivity would only detect when a host's status changed if it happened to win the race.
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/org/connectbot/HostListActivity.java66
-rw-r--r--app/src/main/java/org/connectbot/service/OnHostStatusChangedListener.java26
-rw-r--r--app/src/main/java/org/connectbot/service/TerminalManager.java30
3 files changed, 102 insertions, 20 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index f488bc1..31d54c4 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -20,6 +20,7 @@ package org.connectbot;
import java.util.List;
import org.connectbot.bean.HostBean;
+import org.connectbot.service.OnHostStatusChangedListener;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.transport.TransportFactory;
@@ -57,13 +58,14 @@ import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View.OnKeyListener;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.AdapterView.OnItemClickListener;
-public class HostListActivity extends ListActivity {
+public class HostListActivity extends ListActivity implements OnHostStatusChangedListener {
public final static String TAG = "CB.HostListActivity";
public static final String DISCONNECT_ACTION = "org.connectbot.action.DISCONNECT";
@@ -96,13 +98,6 @@ public class HostListActivity extends ListActivity {
*/
private boolean closeOnDisconnectAll = true;
- protected Handler updateHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- HostListActivity.this.updateList();
- }
- };
-
private ServiceConnection connection = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder service) {
bound = ((TerminalManager.TerminalBinder) service).getService();
@@ -110,12 +105,16 @@ public class HostListActivity extends ListActivity {
// update our listview binder to find the service
HostListActivity.this.updateList();
+ bound.registerOnHostStatusChangedListener(HostListActivity.this);
+
if (waitingForDisconnectAll) {
disconnectAll();
}
}
public void onServiceDisconnected(ComponentName className) {
+ bound.unregisterOnHostStatusChangedListener(HostListActivity.this);
+
bound = null;
HostListActivity.this.updateList();
}
@@ -161,9 +160,6 @@ public class HostListActivity extends ListActivity {
closeOnDisconnectAll = waitingForDisconnectAll && closeOnDisconnectAll;
}
- /* (non-Javadoc)
- * @see android.app.Activity#onNewIntent(android.content.Intent)
- */
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
@@ -370,7 +366,6 @@ public class HostListActivity extends ListActivity {
connect.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
bridge.dispatchDisconnect(true);
- updateHandler.sendEmptyMessage(-1);
return true;
}
});
@@ -410,7 +405,7 @@ public class HostListActivity extends ListActivity {
bridge.dispatchDisconnect(true);
hostdb.deleteHost(host);
- updateHandler.sendEmptyMessage(-1);
+ updateList();
}
})
.setNegativeButton(R.string.delete_neg, null).create().show();
@@ -433,7 +428,6 @@ public class HostListActivity extends ListActivity {
.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.
@@ -511,8 +505,14 @@ public class HostListActivity extends ListActivity {
this.setListAdapter(adapter);
}
- class HostAdapter extends ArrayAdapter<HostBean> {
- private List<HostBean> hosts;
+ @Override
+ public void onHostStatusChanged() {
+ updateList();
+ }
+
+ static class HostAdapter extends BaseAdapter {
+ private final LayoutInflater inflater;
+ private final List<HostBean> hosts;
private final TerminalManager manager;
private final ColorStateList red, green, blue;
@@ -525,8 +525,7 @@ public class HostListActivity extends ListActivity {
}
public HostAdapter(Context context, List<HostBean> hosts, TerminalManager manager) {
- super(context, R.layout.item_host, hosts);
-
+ this.inflater = LayoutInflater.from(context);
this.hosts = hosts;
this.manager = manager;
@@ -539,7 +538,7 @@ public class HostListActivity extends ListActivity {
* Check if we're connected to a terminal with the given host.
*/
private int getConnectedState(HostBean host) {
- // always disconnected if we dont have backend service
+ // always disconnected if we don't have backend service
if (this.manager == null)
return STATE_UNKNOWN;
@@ -553,6 +552,32 @@ public class HostListActivity extends ListActivity {
}
@Override
+ public int getCount() {
+ return hosts.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+ return hosts.get(position);
+ }
+
+ /**
+ * Use the database's IDs for the host.
+ */
+ @Override
+ public long getItemId(int position) {
+ return hosts.get(position).getId();
+ }
+
+ /**
+ * Since we're using the database's IDs, they're unchanging.
+ */
+ @Override
+ public boolean hasStableIds() {
+ return true;
+ }
+
+ @Override
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
@@ -566,8 +591,9 @@ public class HostListActivity extends ListActivity {
holder.icon = (ImageView) convertView.findViewById(android.R.id.icon);
convertView.setTag(holder);
- } else
+ } else {
holder = (ViewHolder) convertView.getTag();
+ }
HostBean host = hosts.get(position);
if (host == null) {
diff --git a/app/src/main/java/org/connectbot/service/OnHostStatusChangedListener.java b/app/src/main/java/org/connectbot/service/OnHostStatusChangedListener.java
new file mode 100644
index 0000000..0d6ced7
--- /dev/null
+++ b/app/src/main/java/org/connectbot/service/OnHostStatusChangedListener.java
@@ -0,0 +1,26 @@
+/*
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2015 Kenny Root, Jeffrey Sharkey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.connectbot.service;
+
+/**
+ * Used to notify interested parties when a {@link TerminalBridge} has changed materially
+ * changed status (e.g., connected, disconnected, name changed, etc).
+ */
+public interface OnHostStatusChangedListener {
+ public void onHostStatusChanged();
+}
diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java
index a15dff0..5416ddb 100644
--- a/app/src/main/java/org/connectbot/service/TerminalManager.java
+++ b/app/src/main/java/org/connectbot/service/TerminalManager.java
@@ -81,6 +81,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
public BridgeDisconnectedListener disconnectListener = null;
+ private final ArrayList<OnHostStatusChangedListener> hostStatusChangedListeners = new ArrayList<>();
+
public Map<String, KeyHolder> loadedKeypairs = new HashMap<String, KeyHolder>();
public Resources res;
@@ -252,6 +254,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
// also update database with new connected time
touchHost(host);
+ notifyHostStatusChanged();
+
return bridge;
}
@@ -354,6 +358,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
disconnected.add(bridge.host);
}
+ notifyHostStatusChanged();
+
if (shouldHideRunningNotification) {
ConnectionNotifier.getInstance().hideRunningNotification(this);
}
@@ -719,4 +725,28 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
mPendingReconnect.clear();
}
}
+
+ /**
+ * Register a {@code listener} that wants to know when a host's status materially changes.
+ * @see #hostStatusChangedListeners
+ */
+ public void registerOnHostStatusChangedListener(OnHostStatusChangedListener listener) {
+ if (!hostStatusChangedListeners.contains(listener)) {
+ hostStatusChangedListeners.add(listener);
+ }
+ }
+
+ /**
+ * Unregister a {@code listener} that wants to know when a host's status materially changes.
+ * @see #hostStatusChangedListeners
+ */
+ public void unregisterOnHostStatusChangedListener(OnHostStatusChangedListener listener) {
+ hostStatusChangedListeners.remove(listener);
+ }
+
+ private void notifyHostStatusChanged() {
+ for (OnHostStatusChangedListener listener : hostStatusChangedListeners) {
+ listener.onHostStatusChanged();
+ }
+ }
}