From 5b96ac07b94c4f2c8e4ffa6862b2c5693965a96d Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Mon, 10 Aug 2015 15:33:05 -0700
Subject: When handling a disconnect, notify dataset changes in a synchronize
 block on pager.

---
 .../main/java/org/connectbot/ConsoleActivity.java  | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'app/src/main/java/org')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 15fd135..0f1de27 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -199,15 +199,17 @@ public class ConsoleActivity extends Activity {
 	protected Handler disconnectHandler = new Handler() {
 		@Override
 		public void handleMessage(Message msg) {
-			Log.d(TAG, "Someone sending HANDLE_DISCONNECT to parentHandler");
+			synchronized (pager) {
+				Log.d(TAG, "Someone sending HANDLE_DISCONNECT to parentHandler");
 
-			// someone below us requested to display a password dialog
-			// they are sending nickname and requested
-			TerminalBridge bridge = (TerminalBridge) msg.obj;
+				// someone below us requested to display a password dialog
+				// they are sending nickname and requested
+				TerminalBridge bridge = (TerminalBridge) msg.obj;
 
-			adapter.notifyDataSetChanged();
-			if (bridge.isAwaitingClose()) {
-				closeBridge(bridge);
+				adapter.notifyDataSetChanged();
+				if (bridge.isAwaitingClose()) {
+					closeBridge(bridge);
+				}
 			}
 		}
 	};
@@ -266,14 +268,12 @@ public class ConsoleActivity extends Activity {
 	 * @param bridge
 	 */
 	private void closeBridge(final TerminalBridge bridge) {
-		synchronized (pager) {
-			updateEmptyVisible();
-			updatePromptVisible();
+		updateEmptyVisible();
+		updatePromptVisible();
 
-			// If we just closed the last bridge, go back to the previous activity.
-			if (pager.getChildCount() == 0) {
-				finish();
-			}
+		// If we just closed the last bridge, go back to the previous activity.
+		if (pager.getChildCount() == 0) {
+			finish();
 		}
 	}
 
-- 
cgit v1.2.3