Merge lp:~charlesk/indicator-datetime/lp-1320880-shorter-notifications-for-calendar-events into lp:indicator-datetime/15.04

[Charles Kerr]

Change notifications for calendar events s.t. the sound is nonrepeating and the notification is temporary, not requiring user interaction to disappear.

Description of the Change
=========================

This branch culls the bugfix for bug #1320880 from my development branch so that it's easier to review and to backport in isolation.

It's a fairly simple patch: it changes notifications for calendar events s.t. the sound is nonrepeating and the notification is temporary, not requiring user interaction to disappear.

Checklist
=========

> Are there any related MPs required for this MP to build/function as expected? Please list.

This MP stacks on top of lp:~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> What device (or emulator) has your component test plan been executed successfully on?

Krillin running ubuntu-touch/ubuntu-rtm/14.09

> What manual tests are relevant for this MP?

indicator-datetime/calendar-event-notification

> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-datetime

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/287/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/287/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

This looks like a jenkins hiccup, but since the ci lab is moving it appears that s-jenkins is unreachable right now. So re-running ci will have to wait a bit.

[Ted Gould (ted)]

Minor nit. Top approve when ready (either way)

review: Approve

[Charles Kerr (charlesk)]

Comment added below; top-approving as per Ted's previous comment.

=== modified file 'src/snap.cpp'
--- src/snap.cpp	2014-12-08 03:09:09 +0000
+++ src/snap.cpp	2014-12-08 03:09:10 +0000
@@ -63,13 +63,19 @@
                     appointment_func snooze,
                     appointment_func ok)
     {
+        /* Alarms and calendar events are treated differently.
+           Alarms should require manual intervention to dismiss.
+           Calendar events are less urgent and shouldn't require manual
+           intervention and shouldn't loop the sound. */
+        const bool interactive = appointment.is_ubuntu_alarm() && m_engine->supports_actions();
+
         // force the system to stay awake
         auto awake = std::make_shared<uin::Awake>(m_engine->app_name());
 
         // create the sound...
         const auto uri = get_alarm_uri(appointment, m_settings);
         const auto volume = m_settings->alarm_volume.get();
-        const bool loop = m_engine->supports_actions();
+        const bool loop = interactive;
         auto sound = std::make_shared<uin::Sound>(uri, volume, loop);
 
         // create the haptic feedback...
@@ -80,12 +86,9 @@
 
         // show a notification...
         const auto minutes = std::chrono::minutes(m_settings->alarm_duration.get());
-        const bool interactive = m_engine->supports_actions();
         uin::Builder b;
         b.set_body (appointment.summary);
         b.set_icon_name ("alarm-clock");
-        b.add_hint (uin::Builder::HINT_SNAP);
-        b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT);
         b.add_hint (uin::Builder::HINT_NONSHAPED_ICON);
 
         const char * timefmt;
@@ -104,6 +107,8 @@
         g_free (title);
         b.set_timeout (std::chrono::duration_cast<std::chrono::seconds>(minutes));
         if (interactive) {
+            b.add_hint (uin::Builder::HINT_SNAP);
+            b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT);
             b.add_action ("ok", _("OK"));
             b.add_action ("snooze", _("Snooze"));
         }

=== modified file 'tests/manual'
--- tests/manual	2014-12-08 03:09:09 +0000
+++ tests/manual	2014-12-08 03:09:10 +0000
@@ -48,6 +48,16 @@
 		<dd>When the alarm is enabled, the alarm icon should reappear.</dd>
 </dl>
 
+Test-case indicator-datetime/calendar-event-notification
+<dl>
+	<dt>In the calendar app, create and save a new upcoming calendar event that will occur in the next few minutes.</dt>
+		<dd>The datetime indicator's event list should update itself to show this new event.</dd>
+		<dd>Calendar events do not get the alarm icon, so no alarm icon should be shown in the header unless there is also an upcoming alarm set.</dd>
+	<dt>Wait for the event's time to be reached</dt>
+		<dd>The datetime indicator should pop up a non-interactive notification that plays a nonlooping sound.</dd>
+		<dd>The notification should disappear after a moment without requiring user intervention.</dd>
+</dl>
+
 Test-case indicator-datetime/alarm-timezone
 <dl>
 	<dt>In ubuntu-system-settings, change your timezone to a zone you're not in</dt>