Update version

billthefarmer · Dec 9, 2019 · b251070 · b251070
1 parent f2b0133
commit b251070
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "org.billthefarmer.diary"
         minSdkVersion 14
         targetSdkVersion 28
-        versionName "1.59"
-        versionCode 159
+        versionName "1.60"
+        versionCode 160
 
         buildConfigField "long", "BUILT", System.currentTimeMillis() + "L"
     }

diff --git a/src/main/java/org/billthefarmer/diary/Diary.java b/src/main/java/org/billthefarmer/diary/Diary.java
@@ -321,15 +321,6 @@ private static CharSequence read(File file)
         return null;
     }
 
-    // setToMidnight
-    private static void setToMidnight(Calendar calendar)
-    {
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-    }
-
     // parseTime
     private static long parseTime(File file)
     {
@@ -2114,8 +2105,10 @@ private void setDate(Calendar date)
         int month = date.get(Calendar.MONTH);
         int day = date.get(Calendar.DATE);
 
-        Calendar today = Calendar.getInstance();
-        setToMidnight(today);
+        Calendar calendar = Calendar.getInstance();
+        Calendar today = new GregorianCalendar(calendar.get(Calendar.YEAR),
+                                               calendar.get(Calendar.MONTH),
+                                               calendar.get(Calendar.DATE));
 
         prevEntry = getPrevEntry(year, month, day);
         if ((prevEntry == null || today.compareTo(prevEntry) > 0) &&