From 077612fa057fca0effa6d8d5b58cf368cbaafb40 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Sun, 9 Jul 2017 08:36:23 +0800 Subject: [PATCH] fix hyb1996-guest/AutoJsIssueReport#5116 --- .../stardust/scriptdroid/sublime/SublimePluginClient.java | 6 +++++- .../scriptdroid/sublime/SublimePluginService.java | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginClient.java b/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginClient.java index 1a6a28e8..cbd18af5 100644 --- a/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginClient.java +++ b/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginClient.java @@ -35,7 +35,7 @@ public class SublimePluginClient { } } - private Socket mSocket; + private volatile Socket mSocket; private Handler mResponseHandler; private String host; private int port; @@ -73,6 +73,10 @@ public class SublimePluginClient { }).start(); } + public boolean isListening() { + return mSocket != null; + } + private void tryClose() { try { close(); diff --git a/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginService.java b/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginService.java index 89c994ad..a7d37eba 100644 --- a/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginService.java +++ b/app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginService.java @@ -13,7 +13,7 @@ public class SublimePluginService { private static SublimePluginClient client; public static boolean isConnected() { - return client != null; + return client != null && client.isListening(); } public static void disconnectIfNeeded() { @@ -44,6 +44,10 @@ public class SublimePluginService { JsonObject object = new JsonObject(); object.addProperty("type", "log"); object.addProperty("log", log); - client.send(object); + try { + client.send(object); + } catch (IllegalStateException e) { + e.printStackTrace(); + } } }