Fix #3

mariogrip · Nov 1, 2014 · e76e224 · e76e224
1 parent 217deb5
commit e76e224
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/java/com/mariogrip/octodroid/Activity.java b/app/src/main/java/com/mariogrip/octodroid/Activity.java
@@ -239,7 +239,6 @@ public void run() {
                             texttimel.setText(" " + "-");
                             textprinttime.setText(" " + util.toHumanRead(Double.parseDouble(util.getData("job", "printTime").toString())));
                             progress.setProgress(util.getProgress());
-
                         }
                          break;
                             case 1:

diff --git a/app/src/main/java/com/mariogrip/octodroid/util.java b/app/src/main/java/com/mariogrip/octodroid/util.java
@@ -245,14 +245,16 @@ public static int getProgress(){
             json = new JSONObject(jsonData_job);
             JSONObject printTime_json = new JSONObject(json.getString("progress"));
                 String comp = printTime_json.getString("completion");
-                if (comp.equals("") || comp.equals("null")){
+                if (comp.equals("") || comp.equals("null")) {
+                    acom = 0;
+                }else{
                     try {
                         acom = Double.parseDouble(comp);
                     }catch (NumberFormatException e){
                         acom = 0;
                     }
                 }
-               if (acom < 0){
+               if (acom < 1){
                     returnData = 0;
                 }else{
                    returnData = (int) acom;
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,7 +239,6 @@ public void run() { @@
                                 texttimel.setText(" " + "-");
                                 textprinttime.setText(" " + util.toHumanRead(Double.parseDouble(util.getData("job", "printTime").toString())));
                                 progress.setProgress(util.getProgress());
                             }
                              break;
                                 case 1:
@@ Expand Down @@