Merge remote-tracking branch 'origin/5.4-MAINT' into rhialto/5.4-MAINT

Rhialto · Jan 8, 2018 · f19041c · f19041c
2 parents d348b3e + 6e392f6
commit f19041c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/k9mail/build.gradle b/k9mail/build.gradle
@@ -56,8 +56,8 @@ android {
         applicationId "com.fsck.k9"
         testApplicationId "com.fsck.k9.tests"
 
-        versionCode 23620
-        versionName '5.402'
+        versionCode 23630
+        versionName '5.403'
 
         minSdkVersion 15
         targetSdkVersion 22

diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java
@@ -1005,7 +1005,7 @@ public static boolean isQuietTime() {
         Integer endHour = Integer.parseInt(mQuietTimeEnds.split(":")[0]);
         Integer endMinute = Integer.parseInt(mQuietTimeEnds.split(":")[1]);
 
-        Integer now = (gregorianCalendar.get(Calendar.HOUR) * 60) + gregorianCalendar.get(Calendar.MINUTE);
+        Integer now = (gregorianCalendar.get(Calendar.HOUR_OF_DAY) * 60) + gregorianCalendar.get(Calendar.MINUTE);
         Integer quietStarts = startHour * 60 + startMinute;
         Integer quietEnds =  endHour * 60 + endMinute;
 

diff --git a/k9mail/src/main/res/xml/changelog_master.xml b/k9mail/src/main/res/xml/changelog_master.xml
@@ -5,6 +5,9 @@
      Locale specific versions are kept in res/xml-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="5.403" versioncode="23630">
+        <change>Fixed bug that caused 'Quiet Time' to behave erratically</change>
+    </release>
     <release version="5.402" versioncode="23620">
         <change>Fixed display issues with certain messages</change>
     </release>