isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-06-10 19:34:44 -04:00
parent 96ab887545
commit af7c4e227d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
View File

@@ -25,11 +25,11 @@ import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.core.reminders.*; import org.isoron.uhabits.core.reminders.*;
import org.isoron.uhabits.core.ui.*; import org.isoron.uhabits.core.ui.*;
import org.isoron.uhabits.core.utils.*;
import javax.inject.*; import javax.inject.*;
import static org.isoron.uhabits.utils.DateUtils.*; import static org.isoron.uhabits.core.utils.DateUtils.applyTimezone;
import static org.isoron.uhabits.core.utils.DateUtils.getLocalTime;
@ReceiverScope @ReceiverScope
public class ReminderController public class ReminderController

3
uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
View File

@@ -66,12 +66,13 @@ public class ReminderControllerTest extends BaseAndroidUnitTest
{ {
Habit habit = mock(Habit.class); Habit habit = mock(Habit.class);
long now = timestamp(2015, 1, 1); long now = timestamp(2015, 1, 1);
long nowTz = DateUtils.applyTimezone(now);
DateUtils.setFixedLocalTime(now); DateUtils.setFixedLocalTime(now);
when(preferences.getSnoozeInterval()).thenReturn(15L); when(preferences.getSnoozeInterval()).thenReturn(15L);
controller.onSnooze(habit); controller.onSnooze(habit);
verify(reminderScheduler).schedule(habit, now + 900000); verify(reminderScheduler).schedule(habit, nowTz + 900000);
verify(notificationTray).cancel(habit); verify(notificationTray).cancel(habit);
} }