From 6ad683b8c8922f4c8f4bddaa89e3e48002c61080 Mon Sep 17 00:00:00 2001 From: manneohlund Date: Tue, 3 Oct 2017 00:07:36 +0200 Subject: [PATCH] [FIX] ShellResultListener reference --- library/src/main/java/ashell/workers/ShellReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/ashell/workers/ShellReader.java b/library/src/main/java/ashell/workers/ShellReader.java index 9b8282d..603e980 100644 --- a/library/src/main/java/ashell/workers/ShellReader.java +++ b/library/src/main/java/ashell/workers/ShellReader.java @@ -33,9 +33,9 @@ public void run() { String line = ""; try { while ((line = reader.readLine()) != null) { - if (onShellResultListener != null && line != null && line.length() != 0) { + if (getOnShellResultListener() != null && line.length() != 0) { //Log.e(this.getName(), "READER: " + line); // TODO: 03/04/17 Remove this? - if (!onShellResultListener.onShellResult(line)) { + if (!getOnShellResultListener().onShellResult(line)) { //Log.e(this.getName(), "READER: " + line); // TODO: 03/04/17 Remove this? if (line.equals(CMD_DONE)) { setBusy(false); @@ -57,8 +57,8 @@ public void run() { e.printStackTrace(); } } - if (notErrorListener && onShellResultListener != null) { - onShellResultListener.onShellResult("SHELL_EXIT"); + if (notErrorListener && getOnShellResultListener() != null) { + getOnShellResultListener().onShellResult("SHELL_EXIT"); onShellStateListener.onShellStateChanged(OnShellStateListener.State.TERMINATED); } }