Merge lp:~phablet-team/gallery-app/fix-camera-launch into lp:gallery-app

[Bill Filler]

fix appId paths to launch camera-app correctly in snap environment

fix appId paths to launch camera-app correctly in snap environment

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1344
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2150
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/552
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2153
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1981/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1981
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1981/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/32/rebuild

review: Approve (continuous-integration)

Unmerged revisions

1344. By Bill Filler on 2016-12-07

fix appId paths to launch camera-app correctly in snap environment

=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml	2016-01-28 13:01:40 +0000
+++ rc/qml/AlbumsOverview.qml	2016-12-07 21:51:05 +0000
@@ -240,7 +240,7 @@
             text: i18n.tr("Camera")
             visible: !APP.desktopMode
             iconName: "camera-app-symbolic"
-            onTriggered: Qt.openUrlExternally("appid://com.ubuntu.camera/camera/current-user-version")
+            onTriggered: Qt.openUrlExternally("appid://camera-app/camera-app/current-user-version")
         }
     ]
 

=== modified file 'rc/qml/EventsOverview.qml'
--- rc/qml/EventsOverview.qml	2016-04-13 19:00:29 +0000
+++ rc/qml/EventsOverview.qml	2016-12-07 21:51:05 +0000
@@ -112,7 +112,7 @@
             text: i18n.tr("Camera")
             visible: !APP.desktopMode
             iconName: "camera-app-symbolic"
-            onTriggered: Qt.openUrlExternally("appid://com.ubuntu.camera/camera/current-user-version")
+            onTriggered: Qt.openUrlExternally("appid://camera-app/camera-app/current-user-version")
         }
     ]
 

=== modified file 'rc/qml/PhotosOverview.qml'
--- rc/qml/PhotosOverview.qml	2016-04-13 19:00:29 +0000
+++ rc/qml/PhotosOverview.qml	2016-12-07 21:51:05 +0000
@@ -138,7 +138,7 @@
                 text: i18n.tr("Camera")
                 visible: !APP.desktopMode
                 iconName: "camera-app-symbolic"
-                onTriggered: Qt.openUrlExternally("appid://com.ubuntu.camera/camera/current-user-version")
+                onTriggered: Qt.openUrlExternally("appid://camera-app/camera-app/current-user-version")
             }
         ]