[FIX] ShellResultListener reference

manneohlund · Oct 2, 2017 · 6ad683b · 6ad683b
1 parent 32d0c26
commit 6ad683b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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);
         }
     }