From b067b78b004f8dd2607fe1acea0e7ec47e108212 Mon Sep 17 00:00:00 2001 From: Jeremy Klein Date: Thu, 13 Aug 2015 15:01:22 -0700 Subject: Call the bridge disconnect listener sychronously on the main thread. This resolves an issue with the adapter count changing without notifyDataSetChanged being called before layout. --- .../main/java/org/connectbot/service/TerminalBridge.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/org/connectbot/service/TerminalBridge.java') diff --git a/app/src/main/java/org/connectbot/service/TerminalBridge.java b/app/src/main/java/org/connectbot/service/TerminalBridge.java index 6333c17..f7be0ae 100644 --- a/app/src/main/java/org/connectbot/service/TerminalBridge.java +++ b/app/src/main/java/org/connectbot/service/TerminalBridge.java @@ -456,8 +456,19 @@ public class TerminalBridge implements VDUDisplay { awaitingClose = true; // Tell the TerminalManager that we can be destroyed now. - if (disconnectListener != null) - disconnectListener.onDisconnected(TerminalBridge.this); + if (disconnectListener != null) { + // The disconnect listener should be run on the main thread if possible. + if (parent != null) { + parent.post(new Runnable() { + @Override + public void run() { + disconnectListener.onDisconnected(TerminalBridge.this); + } + }); + } else { + disconnectListener.onDisconnected(TerminalBridge.this); + } + } } } }); -- cgit v1.2.3