mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-17 22:11:35 +02:00
Code Issues Releases Wiki Activity

set only reminder time and use the current date for assembling the alarm timer

Browse Source
This commit is contained in:
OliE
2017-03-10 19:21:19 +01:00
parent 54181116a5
commit f8de822dbe
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
View File

@@ -103,17 +103,22 @@ public class ReminderPreferences extends PreferenceFragment
public static PendingIntent enableAlarm(Context context, int dayOfWeek, long timeInMillis) public static PendingIntent enableAlarm(Context context, int dayOfWeek, long timeInMillis)
{ {
// We just want the time *not* the date
Calendar timeCal = Calendar.getInstance();
timeCal.setTimeInMillis(timeInMillis);
Calendar alarmCal = Calendar.getInstance(); Calendar alarmCal = Calendar.getInstance();
alarmCal.setTimeInMillis(timeInMillis); alarmCal.set(Calendar.HOUR_OF_DAY, timeCal.get(Calendar.HOUR_OF_DAY));
alarmCal.set(Calendar.MINUTE, timeCal.get(Calendar.MINUTE));
alarmCal.set(Calendar.DAY_OF_WEEK, dayOfWeek); alarmCal.set(Calendar.DAY_OF_WEEK, dayOfWeek);
// Check we aren't setting it in the past which would trigger it to fire instantly // Check we aren't setting it in the past which would trigger it to fire instantly
if (alarmCal.getTimeInMillis() < System.currentTimeMillis()) if (alarmCal.before(Calendar.getInstance()))
{ {
alarmCal.add(Calendar.DAY_OF_YEAR, 7); alarmCal.add(Calendar.DAY_OF_YEAR, 7);
} }
//Log.d(ReminderPreferences.class.getSimpleName(), "Set alarm to " + alarmCal.getTime()); //Log.d(ReminderPreferences.class.getSimpleName(), "Set " + dayOfWeek + " alarm to " + alarmCal.getTime());
AlarmManager alarmMgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); AlarmManager alarmMgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
Intent alarmIntent = new Intent(context, ReminderBootReceiver.class); Intent alarmIntent = new Intent(context, ReminderBootReceiver.class);