Merge pull request #5 from NightscoutFoundation/adrian-timeentryfix

fix for entries between 12.00 and 12.59
NightscoutFoundation · Sep 27, 2016 · 08586f8 · 08586f8
2 parents c847b7e + 741a662
commit 08586f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -959,7 +959,7 @@ private void handleWordPair() {
 
             case "time":
                 Log.d(TAG, "processing time keyword");
-                if ((timeset == false) && (thisnumber > 0)) {
+                if ((timeset == false) && (thisnumber >= 0)) {
 
                     final NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
                     final DecimalFormat df = (DecimalFormat)nf;
@@ -974,7 +974,7 @@ private void handleWordPair() {
                     final SimpleDateFormat simpleDateFormat1 =
                             new SimpleDateFormat("dd/M/yyyy ",Locale.US);
                     final SimpleDateFormat simpleDateFormat2 =
-                            new SimpleDateFormat("dd/M/yyyy hh.mm",Locale.US); // TODO double check 24 hour 12.00 etc
+                            new SimpleDateFormat("dd/M/yyyy HH.mm",Locale.US); // TODO double check 24 hour 12.00 etc
                     final String datenew = simpleDateFormat1.format(c.getTime()) + df.format(thisnumber);
 
                     Log.d(TAG, "Time Timing data datenew: " + datenew);