Merge lp:~dbarth/indicator-datetime/mute-notifications-15.04 into lp:indicator-datetime/15.04

[David Barth]

don't show snap/appointments if the calendar app is blacklisted in system notifications settings
(backported from trunk mp)

don't show snap/appointments if the calendar app is blacklisted in system notifications settings
(backported from trunk mp)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:424
http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~dbarth/indicator-datetime/mute-notifications-15.04]

425. By David Barth on 2016-01-19

make ^Cde a bit more robust, and add some debug statements

426. By David Barth on 2016-01-21

fix

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~dbarth/indicator-datetime/mute-notifications-15.04]

427. By David Barth on 2016-01-22

adjust title and notification icon according to the event type

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-ci/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-armhf-ci/24/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-ci/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-15.04-vivid-armhf-ci/25/console

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

thanks for the work, the "adjust title and notification icon according to the event type" seems a different issue, could you use a different merge request/branch for it?
the commit message states "don't show snap/appointments", could you give some more details? does it concern the indicator menu or the reminders?

review: Needs Fixing

Unmerged revisions

427. By David Barth on 2016-01-22

adjust title and notification icon according to the event type

426. By David Barth on 2016-01-21

fix

425. By David Barth on 2016-01-19

make ^Cde a bit more robust, and add some debug statements

424. By David Barth on 2016-01-18

don't show snap/appointments if the calendar app is blacklisted in system notifications settings

=== modified file 'debian/control'
--- debian/control	2015-10-14 02:13:21 +0000
+++ debian/control	2016-01-22 13:17:56 +0000
@@ -20,6 +20,7 @@
                libgtest-dev,
                libdbustest1-dev,
                dbus-test-runner,
+               gsettings-ubuntu-schemas,
                python3-dbusmock,
 # for 12h/24h locale unit tests:
                locales,
@@ -41,6 +42,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
+         gsettings-ubuntu-schemas,
          systemd-services,
          systemd-shim,
 Recommends: indicator-applet | indicator-renderer,

=== modified file 'src/snap.cpp'
--- src/snap.cpp	2015-10-13 23:28:51 +0000
+++ src/snap.cpp	2016-01-22 13:17:56 +0000
@@ -94,6 +94,12 @@
         // force the system to stay awake
         auto awake = std::make_shared<uin::Awake>(m_engine->app_name());
 
+        // mute notifications of appointments according to system settings
+        // Note: alarms will still fire up normally below
+        if (! appointment.is_ubuntu_alarm() &&
+            notifications_disabled())
+          return;
+
         // calendar events are muted in silent mode; alarm clocks never are
         std::shared_ptr<uin::Sound> sound;
         if (appointment.is_ubuntu_alarm() || !silent_mode()) {
@@ -117,7 +123,7 @@
         const auto minutes = std::chrono::minutes(m_settings->alarm_duration.get());
         uin::Builder b;
         b.set_body (appointment.summary);
-        b.set_icon_name ("alarm-clock");
+        b.set_icon_name (appointment.is_ubuntu_alarm() ? "alarm-clock" : "reminder");
         b.add_hint (uin::Builder::HINT_NONSHAPED_ICON);
 
         const char * timefmt;
@@ -131,7 +137,14 @@
             timefmt = _("%a, %H:%M");
         }
         const auto timestr = appointment.begin.format(timefmt);
-        auto title = g_strdup_printf(_("Alarm %s"), timestr.c_str());
+
+        const char * titlefmt;
+        if (appointment.is_ubuntu_alarm()) {
+            titlefmt = _("Alarm %s");
+        } else {
+            titlefmt = _("Event %s");
+        }
+        auto title = g_strdup_printf(titlefmt, timestr.c_str());
         b.set_title (title);
         g_free (title);
         b.set_timeout (std::chrono::duration_cast<std::chrono::seconds>(minutes));
@@ -160,6 +173,42 @@
 
 private:
 
+    bool notifications_disabled() const
+    {
+        // check if calendar events are disabled in system notification settings
+        GSettings *cunh = g_settings_new("com.ubuntu.notifications.hub");
+        GVariant *blacklist = g_settings_get_value(cunh, "blacklist");
+
+        if (blacklist == NULL) {
+            g_warning("%s Couldn't find notifications blacklist", G_STRLOC);
+            return false;
+        }
+
+        GVariantIter *iter;
+        g_variant_get(blacklist, "a(ss)", &iter);
+
+        gchar *pkg;
+        gchar *app;
+        bool result = false;
+
+        while(g_variant_iter_loop(iter, "(ss)", &pkg, &app)) {
+            if (g_strcmp0(pkg, "com.ubuntu.calendar") == 0) {
+                result = true; // ie, don't show the appointments
+                g_info("%s calendar notifications blacklisted", G_STRLOC);
+                g_free(pkg);
+                g_free(app);
+                break;
+            }
+        }
+
+        g_object_unref(cunh);
+        g_variant_unref(blacklist);
+        g_variant_iter_free(iter);
+
+        return result;
+    }
+
+
     static void on_sound_proxy_ready(GObject* /*source_object*/, GAsyncResult* res, gpointer gself)
     {
         GError * error;