-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
engine-eds: fix retrieving custom alarm sound path
ECal 2.0 returns the list of attachments as a GSList (a singly linked list). I'm not sure why, but the logic for iterating the list is completely incorrect. Fixing that fixes custom alarm sound. A test is added to catch this case. Bug-UBports: https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/issues/183
- Loading branch information
1 parent
254bd7f
commit e089a84
Showing
4 changed files
with
131 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/* | ||
* Copyright 2015 Canonical Ltd. | ||
* Copyright 2021 Robert Tari | ||
* Copyright 2023 UBports Foundation. | ||
* | ||
* This program is free software: you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 3, as published | ||
* by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope that it will be useful, but | ||
* WITHOUT ANY WARRANTY; without even the implied warranties of | ||
* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
* PURPOSE. See the GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along | ||
* with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
* Authors: | ||
* Charles Kerr <charles.kerr@canonical.com> | ||
* Robert Tari <robert@tari.in> | ||
* Ratchanan Srirattanamet <ratchanan@ubports.com> | ||
*/ | ||
|
||
#include <algorithm> | ||
|
||
#include <datetime/alarm-queue-simple.h> | ||
#include <datetime/clock-mock.h> | ||
#include <datetime/engine-eds.h> | ||
#include <datetime/myself.h> | ||
#include <datetime/planner-range.h> | ||
|
||
#include <gtest/gtest.h> | ||
|
||
#include "glib-fixture.h" | ||
#include "timezone-mock.h" | ||
#include "wakeup-timer-mock.h" | ||
|
||
using namespace ayatana::indicator::datetime; | ||
using VAlarmFixture = GlibFixture; | ||
|
||
/*** | ||
**** | ||
***/ | ||
|
||
TEST_F(VAlarmFixture, AlarmCustomSound) | ||
{ | ||
// start the EDS engine | ||
auto engine = std::make_shared<EdsEngine>(std::make_shared<Myself>()); | ||
|
||
// we need a consistent timezone for the planner and our local DateTimes | ||
constexpr char const * zone_str {"America/Recife"}; | ||
auto tz = std::make_shared<MockTimezone>(zone_str); | ||
|
||
#if GLIB_CHECK_VERSION(2, 68, 0) | ||
auto gtz = g_time_zone_new_identifier(zone_str); | ||
|
||
if (gtz == NULL) | ||
{ | ||
gtz = g_time_zone_new_utc(); | ||
} | ||
#else | ||
auto gtz = g_time_zone_new(zone_str); | ||
#endif | ||
|
||
// make a planner that looks at the first half of 2023 in EDS | ||
auto planner = std::make_shared<SimpleRangePlanner>(engine, tz); | ||
const DateTime range_begin {gtz, 2023,1, 1, 0, 0, 0.0}; | ||
const DateTime range_end {gtz, 2023,6,30,23,59,59.5}; | ||
planner->range().set(std::make_pair(range_begin, range_end)); | ||
|
||
// give EDS a moment to load | ||
if (planner->appointments().get().empty()) { | ||
g_message("waiting a moment for EDS to load..."); | ||
auto on_appointments_changed = [this](const std::vector<Appointment>& appointments){ | ||
g_message("ah, they loaded"); | ||
if (!appointments.empty()) | ||
g_main_loop_quit(loop); | ||
}; | ||
core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed)); | ||
constexpr int max_wait_sec = 10; | ||
wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND); | ||
} | ||
|
||
// the planner should match what we've got in the calendar.ics file | ||
const auto appts = planner->appointments().get(); | ||
EXPECT_EQ(1, appts.size()); | ||
EXPECT_EQ(1, appts[0].alarms.size()); | ||
EXPECT_EQ(appts[0].alarms[0].audio_url, "file:///usr/share/sounds/lomiri/ringtones/Entropy.ogg"); | ||
|
||
// cleanup | ||
g_time_zone_unref(gtz); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
BEGIN:VCALENDAR | ||
CALSCALE:GREGORIAN | ||
PRODID:-//Ximian//NONSGML Evolution Calendar//EN | ||
VERSION:2.0 | ||
X-EVOLUTION-DATA-REVISION:2023-06-06T17:25:48.265942Z(42) | ||
BEGIN:VTODO | ||
UID:882a6a702f87a3afde203e5609d2626ba144a3c2 | ||
DTSTAMP:20230606T172548Z | ||
DTSTART:20230607T165701 | ||
PRIORITY:0 | ||
SUMMARY:Alarm | ||
CATEGORIES:x-lomiri-alarm | ||
SEQUENCE:1 | ||
LAST-MODIFIED:20230606T172548Z | ||
BEGIN:VALARM | ||
X-EVOLUTION-ALARM-UID:eceda45c7493b76e41cdb2369ce8160b75e53f98 | ||
ACTION:AUDIO | ||
TRIGGER;RELATED=START:PT0S | ||
REPEAT:0 | ||
DURATION:PT0S | ||
ATTACH:file:///usr/share/sounds/lomiri/ringtones/Entropy.ogg | ||
END:VALARM | ||
BEGIN:VALARM | ||
X-EVOLUTION-ALARM-UID:8eec04befc2876fb13a6726181fed33b9f7810c8 | ||
ACTION:DISPLAY | ||
DESCRIPTION:Alarm | ||
TRIGGER;RELATED=START:PT0S | ||
REPEAT:0 | ||
DURATION:PT0S | ||
END:VALARM | ||
END:VTODO | ||
END:VCALENDAR |