Merge lp:~jonas-drange/ubuntu-system-settings/lp1533835 into lp:ubuntu-system-settings

[Jonas G. Drange]

* Define a map used for mapping short, panel-agnostic URLs and expose translation functionality to both QML and c++.

[Ugo Riboni]
 * Allow url-dispatcher access to App Permissions service pages

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1596. By Jonas G. Drange on 2016-02-10

add system to shortcut

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1595
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2609/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/792
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6421
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6421/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27463

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1596
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2610/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/793
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6426
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27475

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1597. By Jonas G. Drange on 2016-02-11

log

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2611/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/794
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6435
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6435/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27491

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1598
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2612/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/795
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4928
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27522

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1598. By Jonas G. Drange on 2016-02-12

make a qsettings instance for each call due to threading

1599. By Jonas G. Drange on 2016-02-12

fix typo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1599
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2613/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/796
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6459
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27544

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1600. By Jonas G. Drange on 2016-02-12

investigate crash on the phone

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1600
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2614/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6453
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/797
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6464
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6464/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27550

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1601. By Jonas G. Drange on 2016-02-15

wording, refactor

1602. By Jonas G. Drange on 2016-02-15

  Ugo Riboni 2015-12-08 Ensure that we are not pushing the subpages until the PageComponent itself has been pushed

1603. By Jonas G. Drange on 2016-02-15

note about removing duplicate code

1604. By Jonas G. Drange on 2016-02-15

wording, remove extra whitespace

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1604
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2616/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/799
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6490
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6490/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27600

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1605. By Jonas G. Drange on 2016-02-16

remove erroneous /

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1605
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2617/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/800
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27622

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1606. By Jonas G. Drange on 2016-02-16

remove debug

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1606
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2618/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/801
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6516
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6516/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27641

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Needs Information

[lp:~jonas-drange/ubuntu-system-settings/lp1533835]

1607. By Jonas G. Drange on 2016-02-18

improve clarity of comment

[Ken VanDine (ken-vandine)]

Looks good and works well

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1607
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2619/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/802
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6566
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6566/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27748

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/security-privacy/AppAccess.qml'
--- plugins/security-privacy/AppAccess.qml	2015-09-18 14:18:11 +0000
+++ plugins/security-privacy/AppAccess.qml	2016-02-18 15:42: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	2016-02-18 15:42:29 +0000
@@ -53,6 +53,42 @@
         });
         return t;
     }
+    property var pluginOptions
+    Connections {
+        target: pageStack
+        onCurrentPageChanged: {
+            // If we are called with subpage=foo, push foo on the stack.
+            //
+            // 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['subpage']) {
+                    switch (pluginOptions['subpage']) {
+                    case 'location':
+                        pageStack.push(Qt.resolvedUrl("Location.qml"));
+                        break;
+                    case 'permissions':
+                        var page = pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager})
+                        if (pluginOptions['service']) {
+                            page.openService(pluginOptions['service'])
+                        }
+                        break;
+                    }
+                } else if (pluginOptions && pluginOptions['service']) {
+                    // This whole else if branch will be removed once the
+                    // camera app asks for [1] as described in lp:1545733.
+                    // [1] settings:///system/permissions?service=camera
+                    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

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-31 14:53:32 +0000
+++ src/CMakeLists.txt	2016-02-18 15:42:29 +0000
@@ -43,3 +43,4 @@
 set_target_properties(uss-sessionservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
 install(TARGETS uss-accountsservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
 install(TARGETS uss-sessionservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/url-map.ini DESTINATION ${PLUGIN_MANIFEST_DIR})

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2016-02-04 16:26:15 +0000
+++ src/qml/MainWindow.qml	2016-02-18 15:42:29 +0000
@@ -73,7 +73,8 @@
     Connections {
         target: UriHandler
         onOpened: {
-            var url = String(uris)
+            var url = String(uris);
+            url = Utilities.mapUrl(url);
             var panelAndOptions = url.replace("settings:///system/", "")
             var optionIndex = panelAndOptions.indexOf("?")
             var panel = optionIndex > -1 ?

=== added file 'src/url-map.ini'
--- src/url-map.ini	1970-01-01 00:00:00 +0000
+++ src/url-map.ini	2016-02-18 15:42:29 +0000
@@ -0,0 +1,11 @@
+; A list of sources mapped to destinations. A destination is some
+; URL that a plugin is expected to handle.
+;
+; For the sake of simplicity, the first non-empty path component
+; that is not “system” should be used as sources. I.e., given the URL
+; “settings:///system/location” System Settings should check this
+; file for the key “sources/location”.
+
+[sources]
+location=settings:///system/security-privacy?subpage=location
+permissions=settings:///system/security-privacy?subpage=permissions

=== modified file 'src/utils.cpp'
--- src/utils.cpp	2014-10-24 20:04:30 +0000
+++ src/utils.cpp	2016-02-18 15:42:29 +0000
@@ -36,7 +36,7 @@
     for (int i = 1; i < arguments.count(); i++) {
         const QString &argument = arguments.at(i);
         if (argument.startsWith("settings://")) {
-            QUrl urlArgument(argument);
+            QUrl urlArgument(Utilities::getDestinationUrl(argument));
             /* Find out which plugin is required. If the first component of the
              * path is "system", just skip it. */
             QStringList pathComponents =
@@ -76,4 +76,70 @@
     return q_formatted_size;
 }
 
+/*
+ * This function makes getDestinationUrl invokable from QML.
+ */
+QString Utilities::mapUrl(const QString &source)
+{
+    return Utilities::getDestinationUrl(source);
+}
+
+/*
+ * Returns a destination for the given source if the source has an entry
+ * in url-map.ini (based on the first path component, excluding “system”).
+ * If there were any query items on the source, these are appended to the
+ * destination.
+
+ * If the source had no entry, it's returned unchanged.
+ */
+QString Utilities::getDestinationUrl(const QString &source)
+{
+    // This method will be called from multiple threads, and QSettings
+    // is reentrant, meaning each call to this function require its own
+    // settings instance.
+    QSettings map(
+        QString("%1/%2").arg(PLUGIN_MANIFEST_DIR).arg("url-map.ini"),
+        QSettings::IniFormat
+    );
+    map.sync();
+
+    // If reading the map failed, return the source unchanged.
+    if (map.status() != QSettings::NoError) {
+        qWarning() << "reading url map failed: " << map.status();
+        return source;
+    }
+
+    QUrl sourceUrl(source);
+    QStringList pathComponents =
+        sourceUrl.path().split('/', QString::SkipEmptyParts);
+
+    int pluginIndex = 0;
+    if (pathComponents.value(pluginIndex, "") == "system")
+        pluginIndex++;
+    QString key = pathComponents.value(pluginIndex, QString());
+
+    map.beginGroup("sources");
+    if (map.contains(key)) {
+        QString destination = map.value(key, QVariant()).toString();
+
+        // Copy any query items from the source to the destination
+        if (sourceUrl.hasQuery()) {
+            QUrl destinationUrl = QUrl(destination);
+            QUrlQuery sQ(sourceUrl);
+            QUrlQuery dQ(destinationUrl);
+
+            // Insert all query items from source query to destination query.
+            for (int i = 0; i < sQ.queryItems().size(); ++i) {
+                const QPair<QString, QString> a(sQ.queryItems().at(i));
+                dQ.addQueryItem(a.first, a.second);
+            }
+
+            destinationUrl.setQuery(dQ);
+            destination = destinationUrl.toString();
+        }
+        return destination;
+    }
+    return source;
+}
+
 } // namespace

=== modified file 'src/utils.h'
--- src/utils.h	2014-10-24 20:04:30 +0000
+++ src/utils.h	2016-02-18 15:42:29 +0000
@@ -21,6 +21,7 @@
 #ifndef SYSTEM_SETTINGS_UTILS_H
 #define SYSTEM_SETTINGS_UTILS_H
 
+#include <QSettings>
 #include <QStringList>
 #include <QVariantMap>
 
@@ -35,6 +36,8 @@
 public:
     explicit Utilities(QObject *parent = 0);
     Q_INVOKABLE QString formatSize(quint64) const;
+    Q_INVOKABLE QString mapUrl(const QString &source);
+    static QString getDestinationUrl(const QString &source);
 };
 
 } // namespace