From 85366e882d571168269e6abf3d927e8bca85a2ab Mon Sep 17 00:00:00 2001 From: bodaghialib4 Date: Thu, 25 Aug 2022 23:10:54 +0430 Subject: [PATCH] fix issue #22 (App crash when trying to close shell) --- .../java/com/reactlibrary/RNSshClientModule.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/reactlibrary/RNSshClientModule.java b/android/src/main/java/com/reactlibrary/RNSshClientModule.java index a8d97ac..7f0cc4b 100644 --- a/android/src/main/java/com/reactlibrary/RNSshClientModule.java +++ b/android/src/main/java/com/reactlibrary/RNSshClientModule.java @@ -180,7 +180,15 @@ public void run() { client._dataOutputStream = new DataOutputStream(channel.getOutputStream()); callback.invoke(); + } catch (JSchException error) { + Log.e(LOGTAG, "Error starting shell: " + error.getMessage()); + callback.invoke(error.getMessage()); + } catch (IOException error) { + Log.e(LOGTAG, "Error starting shell: " + error.getMessage()); + callback.invoke(error.getMessage()); + } + try { // int charVal; String line; while (client._bufferedReader != null && (line = client._bufferedReader.readLine()) != null) { @@ -193,11 +201,9 @@ public void run() { } } catch (JSchException error) { - Log.e(LOGTAG, "Error starting shell: " + error.getMessage()); - callback.invoke(error.getMessage()); + Log.e(LOGTAG, "Error reading shell output: " + error.getMessage()); } catch (IOException error) { - Log.e(LOGTAG, "Error starting shell: " + error.getMessage()); - callback.invoke(error.getMessage()); + Log.e(LOGTAG, "Error reading shell output: " + error.getMessage()); } } }).start();