From be7e6df6a5b7d317faaf29b1daaa7432cf34b9c2 Mon Sep 17 00:00:00 2001 From: Szymon Jastrzebski Date: Thu, 27 Oct 2016 11:54:30 +0200 Subject: [PATCH] [Alarm] Fixing adding alarms [Feature] Adding alarms sets proper value of RecurrenceType [Verification] TCT tests (Alarm) pass 100% Change-Id: I50f8147543c1f92723b9b567c13b9e35bdb58f57 Signed-off-by: Szymon Jastrzebski --- src/alarm/alarm_manager.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc index 5a66ba6f..5bc8d84d 100755 --- a/src/alarm/alarm_manager.cc +++ b/src/alarm/alarm_manager.cc @@ -151,8 +151,6 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) { } } else { app_control_add_extra_data(app_control, kAlarmKeyType, kAlarmTypeValueAbsolute); - app_control_add_extra_data( - app_control, kAlarmAbsoluteRecurrenceTypeKey, kAlarmAbsoluteRecurrenceTypeNone); const auto it_period = alarm.find("period"); const auto it_daysOfTheWeek = alarm.find("daysOfTheWeek"); @@ -183,10 +181,14 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) { int ret = 0; if (alarm.end() != it_period && it_period->second.is()) { + app_control_add_extra_data( + app_control, kAlarmAbsoluteRecurrenceTypeKey, kAlarmAbsoluteReccurrenceTypeInterval); int period = static_cast(it_period->second.get()); ret = alarm_schedule_at_date(app_control, &start_date, period, &alarm_id); } else if (alarm.end() != it_daysOfTheWeek && it_daysOfTheWeek->second.is() && !(it_daysOfTheWeek->second.get()).empty()) { + app_control_add_extra_data( + app_control, kAlarmAbsoluteRecurrenceTypeKey, kAlarmAbsoluteReccurrenceTypeByDayValue); picojson::array days_of_the_week = it_daysOfTheWeek->second.get(); int repeat_value = 0; for (auto iter = days_of_the_week.begin(); iter != days_of_the_week.end(); ++iter) { @@ -214,6 +216,8 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) { ret = alarm_schedule_with_recurrence_week_flag( app_control, &start_date, repeat_value, &alarm_id); } else { + app_control_add_extra_data( + app_control, kAlarmAbsoluteRecurrenceTypeKey, kAlarmAbsoluteRecurrenceTypeNone); ret = alarm_schedule_at_date(app_control, &start_date, 0, &alarm_id); } -- 2.34.1