ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/security-allow-acceptance-of-here-terms-fixes-1375322 into lp:ubuntu-system-settings

security-allow-acceptance-of-here-terms-fixes-1375322
Merge into trunk

Proposed by Jonas G. Drange on 2014-10-15

Status:

Merged

Approved by:

Ken VanDine on 2014-10-21

Approved revision:

1140

Merged at revision:

1143

Proposed branch:

lp:~jonas-drange/ubuntu-system-settings/security-allow-acceptance-of-here-terms-fixes-1375322

Merge into:

lp:ubuntu-system-settings

Diff against target:

511 lines (+335/-33)

6 files modified

plugins/security-privacy/CMakeLists.txt (+1/-0)
plugins/security-privacy/Location.qml (+164/-32)
plugins/security-privacy/PageComponent.qml (+2/-1)
plugins/security-privacy/here-terms.qml (+123/-0)
plugins/security-privacy/securityprivacy.cpp (+32/-0)
plugins/security-privacy/securityprivacy.h (+13/-0)

To merge this branch:

bzr merge lp:~jonas-drange/ubuntu-system-settings/security-allow-acceptance-of-here-terms-fixes-1375322

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-21
Ken VanDine			Needs Fixing on 2014-10-20
Iain Lane		2014-10-15	Needs Fixing on 2014-10-15
Review via email: mp+238419@code.launchpad.net

Commit message

[security/privacy] allow user to change HERE and location detection settings.

Description of the change

Adds a "radio" element to the Location panel under Security and Privacy. This element lets you toggle HERE and location detection.

Note that during testing, I found that when the location indicator dies if you disable gps and toggle location detection. This renders this new panel unusable (ref bug 1382449).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-15:

FAILED: Continuous integration, rev:1131
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1636/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/828
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4422
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4422/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-15:

FAILED: Continuous integration, rev:1132
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1637/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/829
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7216
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4426
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4426/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-15:

FAILED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1638/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/830
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4427
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4427/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-10-15:

Works for me. Jonas, you had suggested that sometimes setHereEnabled doesn't work. But I couldn't get it to fail for me.

As for the code, I will say that I would prefer that rather than having the main ubuntu-system-settings application import Ubuntu.SystemSettings.Wizard.Utils, I'd like the System class to the shared library. Ideally USS wouldn't rely on the wizard (and if you do keep it like this, you'd need to add a debian/control dependency on the wizard).

You had also mentioned just using the AccountsService class we already have, instead of the custom dbus code in the System class. Which is a fair point. I think that would work, but maybe add async versions of the methods too so we could keep that. But that refactoring is not necessary, just a fair cleanup.

Revision history for this message

Iain Lane (laney) wrote on 2014-10-15:

I added some code comments, and FWIW I agree with Mike on not depending on the wizard from uss.

Not sure why AS is mentioned but indeed the code should go to the helper class, which should be extended if necessary. I remember mentioning that before, probably when this code was added.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-16:

FAILED: Continuous integration, rev:1135
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1642/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/834
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7243
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14763
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4442
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4442/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-16:

FAILED: Continuous integration, rev:1135
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1643/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/835
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5631
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4443/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-16:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-16:

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

review: Approve (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2014-10-16:

Mako testing failed due to some hardware downtime, apologies for the inconvenience.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-16:

FAILED: Continuous integration, rev:1136
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1650/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/842
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7257
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7257/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4454
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4454/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-17:

FAILED: Continuous integration, rev:1138
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1655/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/847
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7265
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4468
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4468/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-17:

Tested this on krillin, worked well. We should look at refactoring this if we ever have more location providers. We'll need to make this more more dynamic, and hopefully share the logic with the wizard.

review: Approve

Revision history for this message

Iain Lane (laney) wrote on 2014-10-17:

On Fri, Oct 17, 2014 at 04:31:28PM -0000, Ken VanDine wrote:
> Review: Approve
>
> Tested this on krillin, worked well. We should look at refactoring this if we ever have more location providers. We'll need to make this more more dynamic, and hopefully share the logic with the wizard.

This is copy and pasted code, so it should be refactored *anyway*.

Also I made some specific suggestions for how the implementation could
be improved, and I still think those are valid.

(not intended to block this MP, but you have my opinion)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-17:

> On Fri, Oct 17, 2014 at 04:31:28PM -0000, Ken VanDine wrote:
> > Review: Approve
> >
> > Tested this on krillin, worked well. We should look at refactoring this if
> we ever have more location providers. We'll need to make this more more
> dynamic, and hopefully share the logic with the wizard.
>
> This is copy and pasted code, so it should be refactored *anyway*.
>
> Also I made some specific suggestions for how the implementation could
> be improved, and I still think those are valid.
>
> (not intended to block this MP, but you have my opinion)

Understood, I captured your comments into bug 1382662

>
> --
> Iain Lane [ <email address hidden> ]
> Debian Developer [ <email address hidden> ]
> Ubuntu Developer [ <email address hidden> ]

Revision history for this message

Iain Lane (laney) wrote on 2014-10-17:

On Fri, Oct 17, 2014 at 07:29:46PM -0000, Ken VanDine wrote:
> > On Fri, Oct 17, 2014 at 04:31:28PM -0000, Ken VanDine wrote:
> > > Review: Approve
> > >
> > > Tested this on krillin, worked well. We should look at refactoring this if
> > we ever have more location providers. We'll need to make this more more
> > dynamic, and hopefully share the logic with the wizard.
> >
> > This is copy and pasted code, so it should be refactored *anyway*.
> >
> > Also I made some specific suggestions for how the implementation could
> > be improved, and I still think those are valid.
> >
> > (not intended to block this MP, but you have my opinion)
>
> Understood, I captured your comments into bug 1382662

Thanks Ken, sorry I didn't review the first implementation.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-20:

FAILED: Continuous integration, rev:1138
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1658/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/850
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4481
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4481/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-20:

In the case where hereInstalled == false, the text in the selector doesn't make much sense:

"Using GPS only (less accurate)"

Which should probably have a different string for that case.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Matthew Paul Thomas (mpt) wrote on 2014-10-28:

> In the case where hereInstalled == false, the text in the selector doesn't make much sense: "Using GPS only (less accurate)"

Specification updated. <https://wiki.ubuntu.com/Location?action=diff&rev2=13&rev1=12> "If Nokia HERE is installed, the first item should be 'GPS only (less accurate)'. If not, it should be simply 'GPS only', and the second item should not be present."

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Jonas G. Drange

Ubuntu Touch System Settings

 === modified file 'plugins/security-privacy/CMakeLists.txt'
 --- plugins/security-privacy/CMakeLists.txt	2014-10-03 13:52:27 +0000
 +++ plugins/security-privacy/CMakeLists.txt	2014-10-21 13:17:19 +0000
@@ -22,6 +22,7 @@
      AppAccess.qml
      AppAccessControl.qml
      Dash.qml
++    here-terms.qml
      Location.qml
      LockSecurity.qml
      Ofono.qml
 === modified file 'plugins/security-privacy/Location.qml'
 --- plugins/security-privacy/Location.qml	2014-09-26 14:59:46 +0000
 +++ plugins/security-privacy/Location.qml	2014-10-21 13:17:19 +0000
@@ -20,22 +20,68 @@
  import GSettings 1.0
  import QMenuModel 0.1
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import Qt.labs.folderlistmodel 2.1
++import QtQuick 2.3
++import Ubuntu.Components 1.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.SystemSettings.SecurityPrivacy 1.0
  import SystemSettings 1.0
  ItemPage {
--    id: dashPage
++    id: locationPage
      title: i18n.tr("Location")
      flickable: scrollWidget
++    property bool useNone: !useLocation
++    property bool canLocate: locationActionGroup.enabled.state !== undefined
++    property bool useLocation: canLocate && locationActionGroup.enabled.state
++    property bool hereInstalled: securityPrivacy.hereLicensePath !== "" && termsModel.count > 0
++    property bool useHere: hereInstalled && securityPrivacy.hereEnabled
++
++    onUseLocationChanged: {
++        var newIndex;
++        if (useLocation) {
++            newIndex = useHere ? 1 : 0;
++        } else {
++            newIndex = detection.model.count - 1;
++        }
++        detection.selectedIndex = newIndex;
++    }
++
++    onCanLocateChanged: {
++        optionsModel.createModel();
++    }
++
++    onHereInstalledChanged: {
++        optionsModel.createModel();
++    }
++
++    UbuntuSecurityPrivacyPanel {
++        id: securityPrivacy
++    }
++
++    FolderListModel {
++        id: termsModel
++        folder: securityPrivacy.hereLicensePath
++        nameFilters: ["*.html"]
++        showDirs: false
++        showOnlyReadable: true
++    }
++
++    QDBusActionGroup {
++        id: locationActionGroup
++        busType: DBus.SessionBus
++        busName: "com.canonical.indicator.location"
++        objectPath: "/com/canonical/indicator/location"
++        property variant enabled: action("location-detection-enabled")
++        Component.onCompleted: start()
++    }
++
      Flickable {
          id: scrollWidget
          anchors.fill: parent
          contentHeight: contentItem.childrenRect.height
--        boundsBehavior: (contentHeight > dashPage.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
++        boundsBehavior: (contentHeight > locationPage.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
          /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
             otherwise the UI might end up in a situation where scrolling doesn't work */
          flickableDirection: Flickable.VerticalFlick
@@ -44,32 +90,110 @@
              anchors.left: parent.left
              anchors.right: parent.right
--            QDBusActionGroup {
--                id: locationActionGroup
--                busType: DBus.SessionBus
--                busName: "com.canonical.indicator.location"
--                objectPath: "/com/canonical/indicator/location"
--
--                property variant enabled: action("location-detection-enabled")
--
--                Component.onCompleted: start()
--            }
--
--            ListItem.Standard {
--                text: i18n.tr("Location detection")
--                control: Switch {
--                    id: locationOn
--                    onClicked: locationActionGroup.enabled.activate()
--                }
--                visible: locationActionGroup.enabled.state !== undefined
--                Component.onCompleted:
--                    clicked.connect(locationOn.clicked)
--            }
--
--            Binding {
--                target: locationOn
--                property: "checked"
--                value: locationActionGroup.enabled.state
++            ListItem.ItemSelector {
++                id: detection
++
++                /* Helper that toggles location detection and HERE based on
++                what selector element was tapped. */
++                function activate (key) {
++                    var usingLocation = locationActionGroup.enabled.state;
++                    if (key === 'none' && usingLocation) {
++                        // turns OFF location detection
++                        locationActionGroup.enabled.activate();
++                    }
++                    if ( (key === 'gps' || key === 'here') && !usingLocation) {
++                        // turns ON location detection
++                        locationActionGroup.enabled.activate();
++                    }
++                    if (locationPage.hereInstalled) {
++                        // toggles whether HERE is enabled
++                        securityPrivacy.hereEnabled = key === 'here';
++                    }
++                }
++                property bool allow: selectedIndex !== (model.count - 1)
++
++                text: i18n.tr("Let the phone detect your location:")
++                expanded: true
++                model: optionsModel
++                delegate: optionsDelegate
++                selectedIndex: {
++                    if (model.count === 0) return 0; // re-creating
++                    if (useNone) return model.count - 1;
++                    if (useLocation && !useHere) return 0;
++                    if (useHere && useLocation) return 1;
++                }
++                onDelegateClicked: {
++                    activate(model.get(index).key);
++                }
++            }
++
++            Component {
++                id: optionsDelegate
++                OptionSelectorDelegate {
++
++                    id: dlgt
++                    text: " "
++                    height: label.height
++                    Label {
++                        id: label
++                        anchors {
++                            left: parent.left
++                            right: parent.right
++                            margins: units.gu(2)
++                            rightMargin: units.gu(6)
++                        }
++                        textFormat: Text.StyledText
++                        text: name
++                        wrapMode: Text.WordWrap
++                        verticalAlignment: Text.AlignVCenter
++                        height: contentHeight + units.gu(4)
++                        onLinkActivated: {
++                            pageStack.push(Qt.resolvedUrl(link))
++                        }
++                        onLineLaidOut: {
++                            dlgt.height = label.height
++                        }
++                    }
++                }
++             }
++
++
++            ListModel {
++                id: optionsModel
++
++                function createModel () {
++                    clear();
++
++                    if (canLocate) {
++                        optionsModel.append({
++                            name: hereInstalled ?
++                                i18n.tr("Using GPS only (less accurate)") :
++                                i18n.tr("Using GPS"),
++                            key: "gps"
++                        });
++                    }
++
++                    if (hereInstalled) {
++                        optionsModel.append({
++                            /* TRANSLATORS: %1 is the resource wherein HERE
++                            terms and conditions reside (typically a qml file).
++                            HERE is a Nokia trademark, so it should probably
++                            not be translated. */
++                            name: i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info.<br>By selecting this option you accept the <a href='%1'>Nokia HERE terms and conditions</a>.").arg("here-terms.qml"),
++                            key: "here"
++                        });
++                    }
++
++                    optionsModel.append({
++                        name: i18n.tr("Not at all"),
++                        key: "none"
++                    });
++                }
++
++                dynamicRoles: true
++                Component.onCompleted: {
++                    createModel();
++                }
+             }
              ListItem.Caption {
@@ -96,9 +220,11 @@
                  visible: showAllUI /* hide until the information is real */
+             }
++            ListItem.Divider {}
++
              ListItem.Standard {
                  text: i18n.tr("Allow access to location:")
--                visible: locationOn.checked
++                enabled: detection.allow
+             }
              TrustStoreModel {
@@ -115,9 +241,15 @@
                          checked: model.granted
                          onClicked: trustStoreModel.setEnabled(index, !model.granted)
+                     }
--                    visible: locationOn.checked
++                    enabled: detection.allow
+                 }
+             }
++
++            ListItem.Standard {
++                text: i18n.tr("None requested")
++                visible: trustStoreModel.count === 0
++                enabled: false
++            }
+         }
+     }
 === modified file 'plugins/security-privacy/PageComponent.qml'
 --- plugins/security-privacy/PageComponent.qml	2014-09-05 09:01:20 +0000
 +++ plugins/security-privacy/PageComponent.qml	2014-10-21 13:17:19 +0000
@@ -124,7 +124,7 @@
              ListItem.Standard {
                  id: securityTitle
                  text: i18n.tr("Security")
--            }
++            }
              ListItem.SingleValue {
                  id: lockingControl
                  objectName: "lockingControl"
@@ -232,6 +232,7 @@
+             }
              ListItem.SingleValue {
                  id: locationItem
++                objectName: "locationItem"
                  text: i18n.tr("Location access")
                  value: ""
                  progression: true
 === added file 'plugins/security-privacy/here-terms.qml'
 --- plugins/security-privacy/here-terms.qml	1970-01-01 00:00:00 +0000
 +++ plugins/security-privacy/here-terms.qml	2014-10-21 13:17:19 +0000
@@ -0,0 +1,123 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.3
++import Qt.labs.folderlistmodel 2.1
++import SystemSettings 1.0
++import Ubuntu.Components 1.1
++import Ubuntu.SystemSettings.SecurityPrivacy 1.0
++
++ItemPage {
++    title: i18n.tr("Nokia HERE")
++    id: termsPage
++
++    UbuntuSecurityPrivacyPanel {
++        id: securityPrivacy
++    }
++
++    FolderListModel {
++        id: termsModel
++        folder: securityPrivacy.hereLicensePath
++        nameFilters: ["*.html"]
++        showDirs: false
++        showOnlyReadable: true
++        onCountChanged: loadFileContent()
++    }
++
++    function makeFileName(lang, country) {
++        return lang + "_" + country + ".html"
++    }
++
++    function defaultCountryForLanguage(lang) {
++        if (lang === "da") return "DK"
++        if (lang === "en") return "US"
++        if (lang === "ko") return "KR"
++        if (lang === "zh") return "CN"
++        return lang.toUpperCase()
++    }
++
++    function determineFileName() {
++        var codes = i18n.language.split(".")[0].split("_")
++        var defaultCountry = defaultCountryForLanguage(codes[0])
++        if (codes.count === 1)
++            codes = [codes[0], defaultCountry]
++        var perfectMatch = makeFileName(codes[0], codes[1])
++        var nearMatch = makeFileName(codes[0], defaultCountry)
++        var nearMatchExists = false
++
++        for (var i = 0; i < termsModel.count; i++) {
++            var fileName = termsModel.get(i, "fileName")
++            if (fileName == perfectMatch) {
++                return perfectMatch
++            } else if (fileName == nearMatch) {
++                nearMatchExists = true
++            }
++        }
++
++        if (nearMatchExists) {
++            return nearMatch
++        } else {
++            return makeFileName("en", "US")
++        }
++    }
++
++    function loadFileContent() {
++        var xhr = new XMLHttpRequest
++        xhr.open("GET", securityPrivacy.hereLicensePath + "/" + determineFileName())
++        console.warn('opening', securityPrivacy.hereLicensePath + "/" + determineFileName())
++        xhr.onreadystatechange = function() {
++            if (xhr.readyState == XMLHttpRequest.DONE) {
++                termsLabel.text = xhr.responseText
++            }
++        }
++        xhr.send()
++    }
++    Flickable {
++        id: scrollWidget
++        anchors.fill: parent
++        contentHeight: contentItem.childrenRect.height
++        boundsBehavior: (contentHeight > termsPage.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
++        /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
++           otherwise the UI might end up in a situation where scrolling doesn't work */
++        flickableDirection: Flickable.VerticalFlick
++
++        Column {
++            width: scrollWidget.width
++
++            Item {
++                height: units.gu(2)
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                }
++            }
++
++            Label {
++                id: termsLabel
++                anchors {
++                    margins: units.gu(2)
++                    left: parent.left
++                    right: parent.right
++                }
++                wrapMode: Text.Wrap
++                linkColor: Theme.palette.normal.backgroundText
++                onLinkActivated: {
++                    Qt.openUrlExternally(link)
++                }
++            }
++        }
++    }
++}
 === modified file 'plugins/security-privacy/securityprivacy.cpp'
 --- plugins/security-privacy/securityprivacy.cpp	2014-09-22 15:21:10 +0000
 +++ plugins/security-privacy/securityprivacy.cpp	2014-10-21 13:17:19 +0000
@@ -30,11 +30,16 @@
  // FIXME: need to do this better including #include "../../src/i18n.h"
  // and linking to it
  #include <libintl.h>
++
++
  QString _(const char *text)
+ {
      return QString::fromUtf8(dgettext(0, text));
+ }
++#define HERE_IFACE   "com.ubuntu.location.providers.here.AccountsService"
++#define ENABLED_PROP "LicenseAccepted"
++#define PATH_PROP    "LicenseBasePath"
  #define AS_INTERFACE "com.ubuntu.AccountsService.SecurityPrivacy"
  #define AS_TOUCH_INTERFACE "com.ubuntu.touch.AccountsService.SecurityPrivacy"
@@ -99,6 +104,12 @@
          } else if (property == "StatsWelcomeScreen") {
              Q_EMIT statsWelcomeScreenChanged();
+         }
++    } else if (interface == HERE_IFACE) {
++        if (property == ENABLED_PROP) {
++            Q_EMIT hereEnabledChanged();
++        } else if (property == PATH_PROP) {
++            Q_EMIT hereLicensePathChanged();
++        }
+     }
+ }
@@ -109,6 +120,8 @@
      Q_EMIT statsWelcomeScreenChanged();
      Q_EMIT enableLauncherWhileLockedChanged();
      Q_EMIT enableIndicatorsWhileLockedChanged();
++    Q_EMIT hereEnabledChanged();
++    Q_EMIT hereLicensePathChanged();
+ }
  bool SecurityPrivacy::getStatsWelcomeScreen()
@@ -462,6 +475,25 @@
+     }
+ }
++bool SecurityPrivacy::hereEnabled()
++{
++    return m_accountsService.getUserProperty(HERE_IFACE,
++                                             ENABLED_PROP).toBool();
++}
++
++void SecurityPrivacy::setHereEnabled(bool enabled)
++{
++    m_accountsService.setUserProperty(HERE_IFACE, ENABLED_PROP,
++                                      QVariant::fromValue(enabled));
++    Q_EMIT(hereEnabledChanged());
++}
++
++QString SecurityPrivacy::hereLicensePath()
++{
++    return m_accountsService.getUserProperty(HERE_IFACE,
++                                             PATH_PROP).toString();
++}
++
  void managerLoaded(GObject    *object,
                     GParamSpec *pspec,
                     gpointer    user_data)
 === modified file 'plugins/security-privacy/securityprivacy.h'
 --- plugins/security-privacy/securityprivacy.h	2014-08-29 05:19:03 +0000
 +++ plugins/security-privacy/securityprivacy.h	2014-10-21 13:17:19 +0000
@@ -59,6 +59,13 @@
      Q_PROPERTY (SecurityType securityType
                  READ getSecurityType
                  NOTIFY securityTypeChanged)
++    Q_PROPERTY (bool hereEnabled
++                READ hereEnabled
++                WRITE setHereEnabled
++                NOTIFY hereEnabledChanged)
++    Q_PROPERTY (QString hereLicensePath
++                READ hereLicensePath
++                NOTIFY hereLicensePathChanged)
  public:
      enum SecurityType {
@@ -80,6 +87,10 @@
      void setEnableIndicatorsWhileLocked(bool enabled);
      SecurityType getSecurityType();
++    bool hereEnabled();
++    void setHereEnabled(bool enabled);
++    QString hereLicensePath();
++
      // Returns error text, if an error occurred
      Q_INVOKABLE QString setSecurity(QString oldValue, QString value, SecurityType type);
      Q_INVOKABLE bool trySetSecurity(SecurityType type);
@@ -94,6 +105,8 @@
      void enableLauncherWhileLockedChanged();
      void enableIndicatorsWhileLockedChanged();
      void securityTypeChanged();
++    void hereEnabledChanged();
++    void hereLicensePathChanged();
  private:
      void loadUser();