From ab9f568a385f3581a25da0c559a34be3b11509be Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 27 Sep 2016 02:08:39 +0200 Subject: [PATCH 1/2] fix for entries between 12.00 and 12.59 --- app/src/main/java/com/eveningoutpost/dexdrip/Home.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java index 87baaab86e..84577c4b12 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java @@ -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); From 741a662073d824aca9418dd7496f0aec34888466 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 27 Sep 2016 03:20:44 +0200 Subject: [PATCH 2/2] allow 0:00 as time --- app/src/main/java/com/eveningoutpost/dexdrip/Home.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java index 84577c4b12..11cda7ed55 100644 --- 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;