Merge lp:~dobey/indicator-datetime/fix-app-names into lp:indicator-datetime

[dobey]

Update app name usage to match snaps.

This updates the clock and calendar app names where they are used for opening the apps. However, there are cases where the apps may not open (clock snap is currently broken, missing url-dispatcher support for snaps, and an issue with repowerd on PCs).

The clock app starts to open, but fails to start due to the snap being broken.
The url-dispatcher support is not ready for snaps, so things that use calendar:/// URIs don't open.
The repowerd issue blocks notifications, so opening calendar from notification not currently possible.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:473
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/10/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1586
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1593
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1371
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1371/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1371
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1371/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1371
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1371/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1371
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1371/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1371
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1371/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1371
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1371/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/10/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Meh. You're right, I don't like these hardcoded names either.

If you want to do further cleanup on this, it wouldn't hurt my feelings

review: Approve

=== modified file 'src/actions-live.cpp'
--- src/actions-live.cpp	2016-05-14 02:07:10 +0000
+++ src/actions-live.cpp	2017-02-01 22:00:03 +0000
@@ -95,7 +95,7 @@
 {
     switch(get_desktop()) {
         case LiveActions::UNITY8:
-            dispatch_url("appid://com.ubuntu.clock/clock/current-user-version");
+            dispatch_url("appid://ubuntu-clock-app/ubuntu-clock-app/current-user-version");
             break;
         case LiveActions::UNITY7:
         default:

=== modified file 'src/notifications.cpp'
--- src/notifications.cpp	2016-09-21 22:07:33 +0000
+++ src/notifications.cpp	2017-02-01 22:00:03 +0000
@@ -462,7 +462,7 @@
     static std::string calendar_app_id()
     {
         auto registry = std::make_shared<ubuntu::app_launch::Registry>();
-        auto app_id = ubuntu::app_launch::AppID::discover(registry, "com.ubuntu.calendar");
+        auto app_id = ubuntu::app_launch::AppID::discover(registry, "ubuntu-calendar-app");
         if (!app_id.empty())
             // Due the use of old API by messaging_menu we need append a extra ".desktop" to the app_id.
             return std::string(app_id) + ".desktop";

=== modified file 'tests/test-live-actions.cpp'
--- tests/test-live-actions.cpp	2016-05-14 02:07:10 +0000
+++ tests/test-live-actions.cpp	2017-02-01 22:00:03 +0000
@@ -161,7 +161,7 @@
 
 namespace
 {
-    const std::string clock_app_url = "appid://com.ubuntu.clock/clock/current-user-version";
+    const std::string clock_app_url = "appid://ubuntu-clock-app/ubuntu-clock-app/current-user-version";
 }
 
 TEST_F(TestLiveActionsFixture, PhoneOpenAlarmApp)