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.

2 files changed, 56 insertions, 0 deletions

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();
+		}
+	}
 }