aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/ConsoleActivity.java
diff options
context:
space:
mode:
authorJeremy Klein <jlklein@google.com>2015-08-10 15:33:05 -0700
committerJeremy Klein <jlklein@google.com>2015-08-13 15:04:54 -0700
commit5b96ac07b94c4f2c8e4ffa6862b2c5693965a96d (patch)
tree8832292e10442bffc02f3b0a2d924eac07708c46 /app/src/main/java/org/connectbot/ConsoleActivity.java
parent39a9114332262e3febd8d2ea7f05c7317744019a (diff)
downloadconnectbot-5b96ac07b94c4f2c8e4ffa6862b2c5693965a96d.tar.gz
connectbot-5b96ac07b94c4f2c8e4ffa6862b2c5693965a96d.tar.bz2
connectbot-5b96ac07b94c4f2c8e4ffa6862b2c5693965a96d.zip
When handling a disconnect, notify dataset changes in a synchronize block on pager.
Diffstat (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java')
-rw-r--r--app/src/main/java/org/connectbot/ConsoleActivity.java28
1 files changed, 14 insertions, 14 deletions
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();
}
}