command getData while true null

javray · Oct 24, 2014 · fe6b6de · fe6b6de
1 parent 05e8228
commit fe6b6de
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/android/Mikrotik.java b/src/android/Mikrotik.java
@@ -71,16 +71,20 @@ else if (action.equals("command")) {
 
             if (res.equals("Sent successfully")) {
               res = "";
-              try {
-                while (!(result = this.aConn.getData()).equals("")) {
-                  res += result;
-                }
+              while (true) {
+                  try {
+                      res = this.aConn.getData();
+                      if (res != null) {
+                          result += res;
+                          if (res.contains("!done")) {
+                            break;
+                          }
+                      }
+                  } catch (InterruptedException ex) {
+                    callbackContext.error("No Data: " + ex.toString());
+                  }
               }
-              catch (InterruptedException e) {
-                callbackContext.error("No Data: " + e.toString());
-                return false;
-              }
-              callbackContext.success(res);
+              callbackContext.success(result);
             }
             else {
               callbackContext.error(res);