calculateAlarmTime

fixes bug "incorrect alarm times when using hours begin at sunset (24)" (#28)

Author: forrestguice

app/src/main/java/com/forrestguice/suntimes/naturalhour/data/NaturalHourProvider.java

@@ -476,7 +476,12 @@ public static long calculateAlarmTime(@NonNull Context context, @Nullable String
             Calendar day = Calendar.getInstance();
             NaturalHourData data = new NaturalHourData(day.getTimeInMillis(), latitude, longitude, altitude);
             calculator.calculateData(resolver, data, false, false);
-            eventTime = data.getNaturalHour(hour[1], momentRatio);
+
+            int i = hour[1];
+            int j = (hour[0] != NaturalHourClockBitmap.HOURMODE_SUNSET) ? i
+                    : (i >= 12) ? i - 12 : i + 12;
+
+            eventTime = data.getNaturalHour(j, momentRatio);
             if (eventTime != null)
             {
                 eventTime.set(Calendar.SECOND, 0);
@@ -498,7 +503,7 @@ public static long calculateAlarmTime(@NonNull Context context, @Nullable String
                 day.add(Calendar.DAY_OF_YEAR, 1);
                 data = new NaturalHourData(day.getTimeInMillis(), latitude, longitude, altitude);
                 calculator.calculateData(resolver, data, false, false);
-                eventTime = data.getNaturalHour(hour[1], momentRatio);
+                eventTime = data.getNaturalHour(j, momentRatio);
                 if (eventTime != null)
                 {
                     eventTime.set(Calendar.SECOND, 0);