Merge lp:~phablet-team/ubuntu-system-settings/permission-page-url into lp:ubuntu-system-settings

[Ugo Riboni]

Allow url-dispatcher access to App Permissions service pages

Allow URLs like //system/security-privacy?service=camera for accessing app permissions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1569
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2545/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5651
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5651/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25871

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2545/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1570
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2547/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5655
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5655/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25874

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2547/rebuild

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM and works well.

We can't do security-privacy/access now if I'm reading the code correctly, so let's do that another time.

review: Approve

[Matthew Paul Thomas (mpt)]

Yay for fixing this bug. However, URLs of the form settings:///system/security-privacy?service=camera are needlessly brittle. It's generally a bad idea for URLs to contain subjective categorization. This applies to a System Settings screen for the same same reason that it applies to a Web page (e.g. bug bug 1516732): links to it shouldn't break if the categorization changes.

Camera permissions won't necessarily be in "Security & Privacy" forever. (For example, we might give them their own top-level category, or combine them with Online Accounts.) And even if they are, "Security & Privacy" won't necessarily be in "System" forever. If either of those things changes, apps that send you to this screen should still send you to this screen, because the URL should not have changed.

So I suggest that it should not be "settings:///system/security-privacy?service=camera", it should be something like "settings:///permissions?service=camera".

=== modified file 'plugins/security-privacy/AppAccess.qml'
--- plugins/security-privacy/AppAccess.qml	2015-09-18 14:18:11 +0000
+++ plugins/security-privacy/AppAccess.qml	2015-12-08 13:33:29 +0000
@@ -27,6 +27,21 @@
     id: root
     title: i18n.tr("App permissions")
 
+    function openService(service) {
+        for (var i = 0; i < appsModel.count; i++) {
+            var item = appsModel.get(i)
+            if (item.service === service) {
+                var model = trustStoreModelComponent.createObject(null, { serviceName: item.trustStoreService })
+                pageStack.push(Qt.resolvedUrl("AppAccessControl.qml"), {
+                                    "title": i18n.tr(item.name),
+                                    "caption": i18n.tr(item.caption),
+                                    "model": model
+                               })
+                return;
+            }
+        }
+    }
+
     Flickable {
         anchors.fill: parent
         contentHeight: contentItem.childrenRect.height
@@ -52,16 +67,19 @@
                     name: QT_TR_NOOP("Camera")
                     caption: QT_TR_NOOP("Apps that have requested access to your camera")
                     trustStoreService: "CameraService"
+                    service: "camera"
                 }
                 ListElement {
                     name: QT_TR_NOOP("Location")
                     caption: QT_TR_NOOP("Apps that have requested access to your location")
                     trustStoreService: "UbuntuLocationService"
+                    service: "location"
                 }
                 ListElement {
                     name: QT_TR_NOOP("Microphone")
                     caption: QT_TR_NOOP("Apps that have requested access to your microphone")
                     trustStoreService: "PulseAudio"
+                    service: "microphone"
                 }
             }
 
@@ -113,4 +131,10 @@
             }
         }
     }
+
+    Component {
+        id: trustStoreModelComponent
+        TrustStoreModel {}
+    }
+
 }

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2015-10-16 13:42:50 +0000
+++ plugins/security-privacy/PageComponent.qml	2015-12-08 13:33:29 +0000
@@ -54,6 +54,28 @@
         return t;
     }
 
+    property var pluginOptions
+    Connections {
+        target: pageStack
+        onCurrentPageChanged: {
+            // If we get called with service=something open the app access page
+            // for that specific service, if it does exist.
+            //
+            // We need to wait until the PageComponent has been pushed to the stack
+            // before pushing the subpages, otherwise they will be pushed below the
+            // PageComponent.
+            if (pageStack.currentPage === root) {
+                if (pluginOptions && pluginOptions['service']) {
+                    var page = pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager})
+                    page.openService(pluginOptions['service'])
+                }
+                // Once done, disable this Connections, so that if the user navigates
+                // back to the root we won't push the subpages again
+                target = null
+            }
+        }
+    }
+
     UbuntuDiagnostics {
         id: diagnosticsWidget
     }