Merge lp:~stolowski/unity-scopes-shell/location-changes into lp:unity-scopes-shell

[Paweł Stołowski]

Use Qt Location API.

Use Qt Location API. It should be tested with corresponding unity8 branch that makes the Dash run confined with apparmor.

I've added a new section to the test plan https://wiki.ubuntu.com/Process/Merges/TestPlan/scopes to cover these changes.

[Marcus Tomlinson (marcustomlinson)]

Looks good, although one observation:

I have Nearby favourited. Once I have enabled location access to scopes and I restart the phone, the scope says "Please enable location..." again. I also notice incorrect weather shown on the Today scope. There's obviously a race in scopes startup and the location becoming available/accessible/enabled. Not sure how easy this would be to fix, but it is a bit confusing.

+ For some reason I can't edit the test plan page anymore, so I'll just add review comments for that here:

1) "for testing purposes, remove home/phablet/.local/share/UbuntuLocationService/trust.db"

missing a / before "home"

2) Select 'Deny'.

should say "Select 'Don't Allow'."

review: Needs Fixing

[Paweł Stołowski (stolowski)]

> Looks good, although one observation:
>
> I have Nearby favourited. Once I have enabled location access to scopes and I
> restart the phone, the scope says "Please enable location..." again. I also
> notice incorrect weather shown on the Today scope. There's obviously a race in
> scopes startup and the location becoming available/accessible/enabled. Not
> sure how easy this would be to fix, but it is a bit confusing.

Right. I've missed that during my refactoring. The implementation should handle this now, however for some reason I'm always getting error (access denied) from Qt location API on the initial request when Dash is starting. I asked Thomas to check the backend.

>
> + For some reason I can't edit the test plan page anymore, so I'll just add
> review comments for that here:
>
> 1) "for testing purposes, remove
> home/phablet/.local/share/UbuntuLocationService/trust.db"
>
> missing a / before "home"
>
> 2) Select 'Deny'.
>
> should say "Select 'Don't Allow'."

Ok, the test plan has been fixed.

[Marcus Tomlinson (marcustomlinson)]

Something weird is happening now. When I select "Don't Allow" location access, scopes that use location appear completely blank (Nothing. Not even a title.).

Looks like we're stuck in a retry loop or something. unity8-dash.log: http://pastebin.ubuntu.com/16941491/

When I enable location access, all scopes work fine again. After disabling location access and rebooting, I get the same blank scope behaviour again :(

review: Needs Fixing

[Paweł Stołowski (stolowski)]

> Something weird is happening now. When I select "Don't Allow" location access,
> scopes that use location appear completely blank (Nothing. Not even a title.).
>
> Looks like we're stuck in a retry loop or something. unity8-dash.log:
> http://pastebin.ubuntu.com/16941491/
>
> When I enable location access, all scopes work fine again. After disabling
> location access and rebooting, I get the same blank scope behaviour again :(

Okay, that should be fixed now.

[Marcus Tomlinson (marcustomlinson)]

Awesome, so apart from the denied location access on startup, this looks good!

review: Approve

[Marcus Tomlinson (marcustomlinson)]

:P Oops! As discussed on IRC: the location access request occurs on setActive(), which causes a weird situation where a user that lands on say: Today or Nearby won't ever get location-specific data if all he/she did was pull to refresh over and over.

review: Needs Fixing

[Marcus Tomlinson (marcustomlinson)]

Yep, that does it :) Thanks for the perseverance!

review: Approve

[Paweł Stołowski (stolowski)]

Simplified the logic to show location prompt immediately on first user-initiated search so long as affected scope needs location. This makes it less confusing. Setting to needing review again.

[Marcus Tomlinson (marcustomlinson)]

> Simplified the logic to show location prompt immediately on first user-
> initiated search so long as affected scope needs location. This makes it less
> confusing. Setting to needing review again.

This is even better! Excellent job Pawel. Looks great.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-05 09:40:46 +0000
+++ CMakeLists.txt	2016-06-10 15:06:19 +0000
@@ -47,6 +47,7 @@
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 find_package(Qt5Gui)
+find_package(Qt5Positioning)
 find_package(Qt5Test)
 find_package(Boost COMPONENTS regex REQUIRED)
 
@@ -54,7 +55,6 @@
 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=12)
 
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
-pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
 pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
 
 # Standard install paths
@@ -122,6 +122,6 @@
 add_subdirectory(src)
 add_subdirectory(tests)
 add_subdirectory(data)
-add_subdirectory(tools)
+#add_subdirectory(tools)
 add_subdirectory(po)
 add_subdirectory(docs)

=== modified file 'debian/control'
--- debian/control	2016-05-25 08:16:27 +0000
+++ debian/control	2016-06-10 15:06:19 +0000
@@ -13,17 +13,13 @@
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),
-               libubuntu-location-service-dev (>= 2.0.1),
                pkg-config,
                python3-dev,
-# the two python- lines should be removed once lp bug #1582280 is fixed
-               python-singledispatch | python-tornado (<< 4.3.0),
-               python-backports-abc | python-tornado (<< 4.3.0),
-               python-tornado,
                python3-sphinx,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                qtdeclarative5-qtquick2-plugin,
+               qtpositioning5-dev,
                unity-schemas (>= 7.3.1),
                libonline-accounts-client-dev,
                intltool,
@@ -61,7 +57,7 @@
 Description: QML plugin for Scopes
  Plugin to integrate scopes with the Unity shell
 
-Package: libscope-harness3
+Package: libscope-harness2
 Section: libdevel
 Architecture: any
 Multi-Arch: same
@@ -77,7 +73,7 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libscope-harness3 (= ${binary:Version})
+         libscope-harness2 (= ${binary:Version})
 Description: Test harness for Unity scopes
  Drive Unity scopes with a simple synchronous API. Make assertions
  about results. Development files.

=== modified file 'debian/control.in'
--- debian/control.in	2016-05-25 08:16:18 +0000
+++ debian/control.in	2016-06-10 15:06:19 +0000
@@ -13,17 +13,13 @@
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),
-               libubuntu-location-service-dev (>= 2.0.1),
                pkg-config,
                python3-dev,
-# the two python- lines should be removed once lp bug #1582280 is fixed
-               python-singledispatch | python-tornado (<< 4.3.0),
-               python-backports-abc | python-tornado (<< 4.3.0),
-               python-tornado,
                python3-sphinx,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                qtdeclarative5-qtquick2-plugin,
+               qtpositioning5-dev,
                unity-schemas (>= 7.3.1),
                libonline-accounts-client-dev,
                intltool,

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2016-03-30 09:43:27 +0000
+++ po/POTFILES.in	2016-06-10 15:06:19 +0000
@@ -6,11 +6,10 @@
 tests/previewtest.cpp
 tests/overviewtest.cpp
 tests/departmentstest.cpp
-tests/locationtest.cpp
 tests/filtersendtoendtest.cpp
+tests/scopesinittest.cpp
 tests/favoritestest.cpp
 tests/optionselectorfiltertest.cpp
-tests/data/scopes/scopes.cpp
 tests/data/mock-scope-departments/mock-scope-departments.cpp
 tests/data/mock-scope-filters/mock-scope-filters.cpp
 tests/data/mock-scope-ttl/mock-scope-ttl.cpp
@@ -64,6 +63,7 @@
 src/python/scope_harness/results-view-py.cpp
 src/python/scope_harness/preview-widget-py.cpp
 src/python/scope_harness/preview-widget-list-py.cpp
+src/Unity/rangeinputfilter.cpp
 src/Unity/previewwidgetmodel.cpp
 src/Unity/departmentnode.cpp
 src/Unity/logintoaccount.cpp
@@ -75,16 +75,19 @@
 src/Unity/geoip.cpp
 src/Unity/plugin.cpp
 src/Unity/scopes.cpp
+src/Unity/filtergroupwidget.cpp
 src/Unity/filters.cpp
 src/Unity/optionselectoroptions.cpp
+src/Unity/locationaccesshelper.cpp
 src/Unity/settingsmodel.cpp
 src/Unity/utils.cpp
 src/Unity/optionselectorfilter.cpp
 src/Unity/resultsmap.cpp
-src/Unity/locationservice.cpp
 src/Unity/ubuntulocationservice.cpp
+src/Unity/valueslidervalues.cpp
 src/Unity/iconutils.cpp
 src/Unity/department.cpp
+src/Unity/valuesliderfilter.cpp
 src/Unity/categories.cpp
 src/Unity/overviewresults.cpp
 src/Unity/resultsmodel.cpp
@@ -134,16 +137,20 @@
 src/Unity/overviewresults.h
 src/Unity/plugin.h
 src/Unity/department.h
+src/Unity/valueslidervalues.h
+src/Unity/locationaccesshelper.h
 src/Unity/scope.h
+src/Unity/rangeinputfilter.h
 src/Unity/filters.h
 src/Unity/logintoaccount.h
 src/Unity/overviewcategories.h
 src/Unity/modelupdate.h
-src/Unity/locationservice.h
 src/Unity/overviewscope.h
 src/Unity/settingsmodel.h
+src/Unity/valuesliderfilter.h
 src/Unity/resultsmodel.h
 src/Unity/geoip.h
+src/Unity/filtergroupwidget.h
 src/Unity/resultsmap.h
 src/Unity/collectors.h
 src/Unity/previewwidgetmodel.h

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-06-17 06:56:58 +0000
+++ src/CMakeLists.txt	2016-06-10 15:06:19 +0000
@@ -1,14 +1,8 @@
-
-include_directories(
-    ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}
-)
-
 set(
     SCOPES_SHELL_DEPENDENCIES
     ${SCOPESLIB_LDFLAGS}
     ${GSETTINGSQT_LDFLAGS}
     ${U1DB_LDFLAGS}
-    ${UBUNTU_LOCATION_SERVICE_LDFLAGS}
     ${ONLINE_ACCOUNTS_CLIENT_LDFLAGS}
 )
 
@@ -19,9 +13,9 @@
     Gui
     Network
     Qml
+    Positioning
 )
 
 add_subdirectory(Unity)
 add_subdirectory(scope-harness)
 add_subdirectory(python)
-

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2016-03-10 15:54:33 +0000
+++ src/Unity/CMakeLists.txt	2016-06-10 15:06:19 +0000
@@ -29,7 +29,7 @@
     valueslidervalues.cpp
     geoip.cpp
     localization.h
-    locationservice.cpp
+    locationaccesshelper.cpp
     overviewcategories.cpp
     overviewresults.cpp
     overviewscope.cpp

=== added file 'src/Unity/locationaccesshelper.cpp'
--- src/Unity/locationaccesshelper.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/locationaccesshelper.cpp	2016-06-10 15:06:19 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#include "locationaccesshelper.h"
+#include <QDir>
+#include <QFile>
+#include <QStandardPaths>
+#include <QDebug>
+
+namespace scopes_ng
+{
+
+const QString LocationAccessHelper::scopesLocationDotFile = ".scopesLocationPrompt";
+
+LocationAccessHelper::LocationAccessHelper(QObject *parent) :
+    QObject(parent),
+    m_dotFileExists(false),
+    m_denied(true)
+{
+}
+
+void LocationAccessHelper::init()
+{
+    auto const path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+    QDir locationPromptFile(path);
+    m_dotFileExists = locationPromptFile.exists(scopesLocationDotFile);
+
+    if (m_dotFileExists) {
+        // dot file exists, it means user was already prompted for location so we can
+        // safely request location on startup without risking immediate trusted prompt.
+        Q_EMIT requestInitialLocation();
+    }
+}
+
+bool LocationAccessHelper::trustedPromptWasShown() const
+{
+    return m_dotFileExists;
+}
+
+bool LocationAccessHelper::isLocationAccessDenied() const
+{
+    return m_denied;
+}
+
+void LocationAccessHelper::geoIpLookupFinished()
+{
+    qDebug() << "LocationAccessHelper::geoIpLookupFinished";
+    // This signal is not interesting at the moment. If, however we need to refresh scopes on location update,
+    // then it should be re-emited (forwarded) here and in positonChanged() below.
+}
+
+void LocationAccessHelper::positionChanged()
+{
+    if (m_denied) {
+        m_denied = false;
+        Q_EMIT accessChanged();
+    }
+
+    if (!m_dotFileExists) {
+        createLocationPromptFile();
+    }
+}
+
+void LocationAccessHelper::accessDenied()
+{
+    qDebug() << "LocationAccessHelper::accessDenied";
+    if (!m_denied) {
+        m_denied = true;
+        Q_EMIT accessChanged();
+    }
+
+    if (!m_dotFileExists) {
+        createLocationPromptFile();
+    }
+}
+
+void LocationAccessHelper::createLocationPromptFile()
+{
+    auto const path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/" + scopesLocationDotFile;
+    QFile locationPromptFile(path);
+    if (locationPromptFile.open(QIODevice::WriteOnly)) {
+        qDebug() << "Creating" << locationPromptFile.fileName();
+        m_dotFileExists = true;
+    } else {
+        qWarning() << "Failed to create" << locationPromptFile.fileName();
+    }
+}
+
+}

=== added file 'src/Unity/locationaccesshelper.h'
--- src/Unity/locationaccesshelper.h	1970-01-01 00:00:00 +0000
+++ src/Unity/locationaccesshelper.h	2016-06-10 15:06:19 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include <QObject>
+
+namespace scopes_ng
+{
+
+class Q_DECL_EXPORT LocationAccessHelper: public QObject
+{
+    Q_OBJECT
+
+public:
+    LocationAccessHelper(QObject *parent = nullptr);
+    void init();
+
+    bool trustedPromptWasShown() const;
+    bool isLocationAccessDenied() const;
+
+public Q_SLOTS:
+    void accessDenied();
+    void positionChanged();
+    void geoIpLookupFinished();
+
+Q_SIGNALS:
+    void accessChanged();
+    void requestInitialLocation();
+
+private:
+    void createLocationPromptFile();
+
+    bool m_dotFileExists;
+    bool m_denied;
+
+    static const QString scopesLocationDotFile;
+};
+
+}

=== removed file 'src/Unity/locationservice.cpp'
--- src/Unity/locationservice.cpp	2014-07-15 08:37:40 +0000
+++ src/Unity/locationservice.cpp	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-/*
- * 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/>.
- *
- * Authors:
- *  Pete Woods <[e-mail]>
- */
-
-#include <locationservice.h>
-
-using namespace scopes_ng;
-
-LocationService::LocationService() {
-
-}

=== removed file 'src/Unity/locationservice.h'
--- src/Unity/locationservice.h	2015-02-26 18:02:32 +0000
+++ src/Unity/locationservice.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * 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/>.
- *
- * Authors:
- *  Pete Woods <[e-mail]>
- */
-
-#ifndef LOCATIONSERVICE_H
-#define LOCATIONSERVICE_H
-
-#include <QObject>
-
-#include <com/ubuntu/location/heading.h>
-#include <com/ubuntu/location/position.h>
-#include <com/ubuntu/location/update.h>
-#include <com/ubuntu/location/velocity.h>
-
-#include <unity/scopes/Location.h>
-
-namespace scopes_ng
-{
-
-class Q_DECL_EXPORT LocationService : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(unity::scopes::Location location READ location NOTIFY locationChanged)
-
-    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
-
-public:
-    typedef QSharedPointer<LocationService> Ptr;
-
-    class Token : public QObject
-    {
-    };
-
-    LocationService();
-
-    virtual ~LocationService() = default;
-
-    virtual unity::scopes::Location location() const = 0;
-
-    virtual bool hasLocation() const = 0;
-
-    virtual bool isActive() const = 0;
-
-public Q_SLOTS:
-    virtual QSharedPointer<Token> activate() = 0;
-
-Q_SIGNALS:
-    void locationChanged();
-
-    void activeChanged();
-
-};
-
-} // namespace scopes_ng
-
-#endif /* LOCATIONSERVICE_H_ */

=== modified file 'src/Unity/overviewscope.cpp'
--- src/Unity/overviewscope.cpp	2016-02-04 15:19:37 +0000
+++ src/Unity/overviewscope.cpp	2016-06-10 15:06:19 +0000
@@ -145,7 +145,7 @@
     categories->updateOtherScopes(otherScopes, scopeIdToName);
 }
 
-void OverviewScope::dispatchSearch()
+void OverviewScope::dispatchSearch(bool)
 {
     qWarning() << "Search is not implemented for Manage Dash";
 }

=== modified file 'src/Unity/overviewscope.h'
--- src/Unity/overviewscope.h	2016-02-04 15:19:37 +0000
+++ src/Unity/overviewscope.h	2016-06-10 15:06:19 +0000
@@ -37,7 +37,7 @@
     /* getters */
     QString id() const override;
 
-    void dispatchSearch() override;
+    void dispatchSearch(bool) override;
     void setActive(const bool) override;
 
     void updateFavorites(const QStringList& favorites);

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2016-05-25 08:16:09 +0000
+++ src/Unity/scope.cpp	2016-06-10 15:06:19 +0000
@@ -24,8 +24,8 @@
 // local
 #include "categories.h"
 #include "collectors.h"
+#include "locationaccesshelper.h"
 #include "previewmodel.h"
-#include "locationservice.h"
 #include "utils.h"
 #include "scopes.h"
 #include "settingsmodel.h"
@@ -77,7 +77,8 @@
 
 Scope::Ptr Scope::newInstance(scopes_ng::Scopes* parent)
 {
-    return Scope::Ptr(new Scope(parent), &QObject::deleteLater);
+    auto scope = Scope::Ptr(new Scope(parent), &QObject::deleteLater);
+    return scope;
 }
 
 Scope::Scope(scopes_ng::Scopes* parent) :
@@ -696,7 +697,7 @@
     m_filterState = filterState;
 }
 
-void Scope::dispatchSearch()
+void Scope::dispatchSearch(bool programmaticSearch)
 {
     m_initialQueryDone = true;
 
@@ -736,6 +737,20 @@
     // (i.e. while the loading bar is visible).
     update_child_scopes();
 
+    // handle the case where single scope is refreshed multiple times without switching
+    // to another scope, which would never trigger location prompt.
+    if (m_scopeMetadata && m_scopeMetadata->location_data_needed() && !m_locationToken)
+    {
+        if (m_isActive)
+        {
+            Q_ASSERT(m_scopesInstance);
+
+            if ((!programmaticSearch) || m_scopesInstance->locationAccessHelper()->trustedPromptWasShown()) {
+                m_locationToken = m_locationService->activate();
+            }
+        }
+    }
+
     if (m_proxy) {
         scopes::SearchMetadata meta(m_cardinality, QLocale::system().name().toStdString(), m_formFactor.toStdString());
         auto const userAgent = m_scopesInstance->userAgentString();
@@ -764,6 +779,7 @@
 
         scopes::SearchListenerBase::SPtr listener(new SearchResultReceiver(this));
         m_searchController->setListener(listener);
+
         try {
             qDebug() << "Dispatching search:" << id() << m_searchQuery << m_currentNavigationId;
             scopes::QueryCtrlProxy controller = m_queryUserData ?
@@ -792,6 +808,11 @@
     m_customizations = converted.toMap();
     Q_EMIT customizationsChanged();
 
+    createSettingsModel();
+}
+
+void Scope::createSettingsModel()
+{
     try
     {
         scopes::Variant settings_definitions;
@@ -806,10 +827,20 @@
             shareDir = QDir::home().filePath(QStringLiteral(".config/unity-scopes"));
         }
 
+        Q_ASSERT(m_scopesInstance);
+
         m_settingsModel.reset(
                 new SettingsModel(shareDir, id(),
-                        scopeVariantToQVariant(settings_definitions), this));
+                        scopeVariantToQVariant(settings_definitions),
+                        !m_scopesInstance->locationAccessHelper()->isLocationAccessDenied(),
+                        this));
+
         QObject::connect(m_settingsModel.data(), &SettingsModel::settingsChanged, this, &Scope::invalidateResults);
+
+        // If the scope needs location, then changes to global location access need to be monitored.
+        if (m_scopeMetadata->location_data_needed()) {
+            QObject::connect(m_scopesInstance->locationAccessHelper().data(), &LocationAccessHelper::accessChanged, this, &Scope::locationAccessChanged);
+        }
     }
     catch (unity::scopes::NotFoundException&)
     {
@@ -906,6 +937,16 @@
     return m_settingsModel.data();
 }
 
+void Scope::locationAccessChanged()
+{
+    qDebug() << "Location access changed, recreating settings model for scope" << id();
+    createSettingsModel();
+
+    // Force child scopes refresh
+    m_childScopesDirty = true;
+    update_child_scopes();
+}
+
 bool Scope::require_child_scopes_refresh() const
 {
     if (m_settingsModel && m_scopesInstance)
@@ -1116,11 +1157,7 @@
 
         if (m_scopeMetadata && m_scopeMetadata->location_data_needed())
         {
-            if (m_isActive)
-            {
-                m_locationToken = m_locationService->activate();
-            }
-            else
+            if (!m_isActive)
             {
                 m_locationToken.reset();
             }

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2016-05-06 07:32:13 +0000
+++ src/Unity/scope.h	2016-06-10 15:06:19 +0000
@@ -43,7 +43,8 @@
 #include "collectors.h"
 #include "departmentnode.h"
 #include "department.h"
-#include "locationservice.h"
+#include "ubuntulocationservice.h"
+#include "locationaccesshelper.h"
 
 namespace scopes_ng
 {
@@ -51,7 +52,6 @@
 class Categories;
 class PushEvent;
 class PreviewModel;
-class LocationService;
 class SettingsModel;
 class Scopes;
 
@@ -185,7 +185,7 @@
 public Q_SLOTS:
     void invalidateChildScopes();
     void invalidateResults();
-    virtual void dispatchSearch();
+    virtual void dispatchSearch(bool programmaticSearch = false);
     void setSearchInProgress(bool searchInProgress);
     void setActivationInProgress(bool activationInProgress);
 
@@ -200,6 +200,7 @@
     void flushUpdates(bool finalize = false);
     void metadataRefreshed();
     void departmentModelDestroyed(QObject* obj);
+    void locationAccessChanged();
     void filterStateChanged();
     void previewModelDestroyed(QObject *obj);
 
@@ -208,6 +209,7 @@
 
     void setStatus(unity::shell::scopes::ScopeInterface::Status status);
     void invalidateLastSearch();
+    void createSettingsModel();
 
     unity::scopes::ScopeProxy proxy() const;
 
@@ -278,8 +280,8 @@
     QMultiMap<QString, Department*> m_departmentModels;
     QMap<Department*, QString> m_inverseDepartments;
     QMetaObject::Connection m_metadataConnection;
-    QSharedPointer<LocationService> m_locationService;
-    QSharedPointer<LocationService::Token> m_locationToken;
+    QSharedPointer<UbuntuLocationService> m_locationService;
+    QSharedPointer<UbuntuLocationService::Token> m_locationToken;
     QNetworkConfigurationManager m_network_manager;
     QList<PreviewModel*> m_previewModels;
 };

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2016-05-05 09:41:13 +0000
+++ src/Unity/scopes.cpp	2016-06-10 15:06:19 +0000
@@ -107,6 +107,7 @@
     , m_listThread(nullptr)
     , m_loaded(false)
     , m_prepopulateFirstScope(true)
+    , m_locationAccessHelper(new LocationAccessHelper(nullptr))
     , m_priv(new Priv())
 {
     QByteArray noFav = qgetenv("UNITY_SCOPES_NO_FAVORITES");
@@ -136,6 +137,11 @@
     connect(&m_registryRefreshTimer, SIGNAL(timeout()), this, SLOT(scopeRegistryChanged()));
 
     m_locationService.reset(new UbuntuLocationService());
+    QObject::connect(m_locationAccessHelper.data(), &LocationAccessHelper::requestInitialLocation, m_locationService.data(), &UbuntuLocationService::requestInitialLocation);
+    QObject::connect(m_locationService.data(), &UbuntuLocationService::accessDenied, m_locationAccessHelper.data(), &LocationAccessHelper::accessDenied);
+    QObject::connect(m_locationService.data(), &UbuntuLocationService::locationChanged, m_locationAccessHelper.data(), &LocationAccessHelper::positionChanged);
+    QObject::connect(m_locationService.data(), &UbuntuLocationService::geoIpLookupFinished, m_locationAccessHelper.data(), &LocationAccessHelper::geoIpLookupFinished);
+    m_locationAccessHelper->init();
 
     createUserAgentString();
 
@@ -162,6 +168,11 @@
     m_scopesToDelete.clear();
 }
 
+QSharedPointer<LocationAccessHelper> Scopes::locationAccessHelper() const
+{
+    return m_locationAccessHelper;
+}
+
 int Scopes::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent)
@@ -330,9 +341,15 @@
     }
     else
     {
+        qDebug() << "Waiting for initial location update";
+
         // Otherwise we have to wait for location data
         // Either the the location data needs to change, or the timeout happens
-        connect(m_locationService.data(), &LocationService::locationChanged,
+        connect(m_locationService.data(), &UbuntuLocationService::locationChanged,
+                this, &Scopes::completeDiscoveryFinished);
+        connect(m_locationService.data(), &UbuntuLocationService::accessDenied,
+                this, &Scopes::completeDiscoveryFinished);
+        connect(m_locationService.data(), &UbuntuLocationService::locationTimeout,
                 this, &Scopes::completeDiscoveryFinished);
         connect(&m_startupQueryTimeout, &QTimer::timeout, this,
                 &Scopes::completeDiscoveryFinished);
@@ -344,11 +361,16 @@
 
 void Scopes::completeDiscoveryFinished()
 {
+    qDebug() << "Scopes discovery completed";
     // Kill off everything that could potentially trigger the startup queries
     m_startupQueryTimeout.stop();
     disconnect(&m_startupQueryTimeout, &QTimer::timeout, this,
                &Scopes::completeDiscoveryFinished);
-    disconnect(m_locationService.data(), &LocationService::locationChanged,
+    disconnect(m_locationService.data(), &UbuntuLocationService::locationChanged,
+               this, &Scopes::completeDiscoveryFinished);
+    disconnect(m_locationService.data(), &UbuntuLocationService::accessDenied,
+               this, &Scopes::completeDiscoveryFinished);
+    disconnect(m_locationService.data(), &UbuntuLocationService::locationTimeout,
                this, &Scopes::completeDiscoveryFinished);
 
     processFavoriteScopes();
@@ -376,7 +398,7 @@
             qDebug() << "Pre-populating first scope";
             scope->setSearchQuery(QLatin1String(""));
             // must dispatch search explicitly since setSearchQuery will not do that for inactive scope
-            scope->dispatchSearch();
+            scope->dispatchSearch(true);
         }
     }
 }
@@ -393,7 +415,7 @@
                     qDebug() << "Pre-populating scope" << scope->id();
                     scope->setSearchQuery(QLatin1String(""));
                     // must dispatch search explicitly since setSearchQuery will not do that for inactive scope
-                    scope->dispatchSearch();
+                    scope->dispatchSearch(true);
                 }
             }
             break;
@@ -791,7 +813,7 @@
     return m_loaded;
 }
 
-LocationService::Ptr Scopes::locationService() const
+UbuntuLocationService::Ptr Scopes::locationService() const
 {
     return m_locationService;
 }

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2016-04-18 10:10:25 +0000
+++ src/Unity/scopes.h	2016-06-10 15:06:19 +0000
@@ -22,6 +22,7 @@
 
 #include <unity/shell/scopes/ScopesInterface.h>
 #include "scope.h"
+#include "locationaccesshelper.h"
 
 // Qt
 #include <QList>
@@ -43,7 +44,8 @@
 namespace scopes_ng
 {
 
-class LocationService;
+class UbuntuLocationService;
+class LocationAccessHelper;
 class Scope;
 class OverviewScope;
 
@@ -75,12 +77,13 @@
     unity::shell::scopes::ScopeInterface* overviewScope() const override;
     Scope::Ptr overviewScopeSPtr() const;
 
-    QSharedPointer<LocationService> locationService() const;
+    QSharedPointer<UbuntuLocationService> locationService() const;
     QString userAgentString() const;
 
     Scope::Ptr findTempScope(QString const& id) const;
     void addTempScope(Scope::Ptr const& scope);
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
+    QSharedPointer<LocationAccessHelper> locationAccessHelper() const;
 
 Q_SIGNALS:
     void metadataRefreshed();
@@ -124,10 +127,11 @@
     bool m_loaded;
     bool m_prepopulateFirstScope;
 
-    QSharedPointer<LocationService> m_locationService;
+    QSharedPointer<UbuntuLocationService> m_locationService;
     QTimer m_startupQueryTimeout;
     QTimer m_scopesToDeleteTimer;
     QTimer m_registryRefreshTimer;
+    QSharedPointer<LocationAccessHelper> m_locationAccessHelper;
 
     unity::scopes::Runtime::SPtr m_scopesRuntime;
     QMap<QString, Scope::Ptr> m_tempScopes;

=== modified file 'src/Unity/settingsmodel.cpp'
--- src/Unity/settingsmodel.cpp	2016-05-19 07:18:18 +0000
+++ src/Unity/settingsmodel.cpp	2016-06-10 15:06:19 +0000
@@ -74,7 +74,8 @@
 }  // namespace
 
 SettingsModel::SettingsModel(const QDir& configDir, const QString& scopeId,
-        const QVariant& settingsDefinitions, QObject* parent,
+        const QVariant& settingsDefinitions, bool isLocationGloballyEnabled,
+        QObject* parent,
         int settingsTimeout)
         : SettingsModelInterface(parent), m_scopeId(scopeId), m_settingsTimeout(settingsTimeout),
           m_requireChildScopesRefresh(false)
@@ -98,6 +99,12 @@
         QVariantMap data = it.toMap();
         QString id = data[QStringLiteral("id")].toString();
         QString displayName = data[QStringLiteral("displayName")].toString();
+
+        if (id == "internal.location" && !isLocationGloballyEnabled) {
+            qDebug() << "Location setting ignored, waiting for global location access to be enabled first";
+            continue;
+        }
+
         QVariantMap properties;
         QVariant defaultValue;
         if (data.contains(QStringLiteral("displayValues")))

=== modified file 'src/Unity/settingsmodel.h'
--- src/Unity/settingsmodel.h	2016-05-19 07:06:55 +0000
+++ src/Unity/settingsmodel.h	2016-06-10 15:06:19 +0000
@@ -65,7 +65,8 @@
 
 public:
     explicit SettingsModel(const QDir& configDir, const QString& scopeId,
-            const QVariant& settingsDefinitions, QObject* parent = 0,
+            const QVariant& settingsDefinitions, bool isLocationGloballyEnabled = true,
+            QObject* parent = 0,
             int settingsTimeout = 300);
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const

=== modified file 'src/Unity/ubuntulocationservice.cpp'
--- src/Unity/ubuntulocationservice.cpp	2015-09-08 12:32:05 +0000
+++ src/Unity/ubuntulocationservice.cpp	2016-06-10 15:06:19 +0000
@@ -20,27 +20,10 @@
 #include "ubuntulocationservice.h"
 
 #include <QDebug>
-#include <QMutexLocker>
-#include <QRunnable>
-#include <QThreadPool>
-#include <QTimer>
-
-#include <com/ubuntu/location/service/stub.h>
-
-#include <core/dbus/resolver.h>
-#include <core/dbus/asio/executor.h>
-
-#include <memory>
 
 using namespace std;
-using namespace std::placeholders;
 using namespace scopes_ng;
 
-namespace cul = com::ubuntu::location;
-namespace culs = com::ubuntu::location::service;
-namespace culss = com::ubuntu::location::service::session;
-namespace culu = com::ubuntu::location::units;
-namespace dbus = core::dbus;
 namespace scopes = unity::scopes;
 
 namespace
@@ -55,28 +38,9 @@
      * Re-do the GeoIP call every 60 seconds
      */
     static const int GEOIP_INTERVAL = 60000;
-
-    class DBusThread : public QThread
-    {
-
-    public:
-        DBusThread(const dbus::Bus::Ptr& bus) :
-                m_bus(bus)
-        {
-        }
-
-    protected:
-        void run() override
-        {
-            m_bus->run();
-        }
-
-        dbus::Bus::Ptr m_bus;
-    };
-
 }
 
-class UbuntuLocationService::TokenImpl: public LocationService::Token
+class UbuntuLocationService::TokenImpl: public UbuntuLocationService::Token
 {
     Q_OBJECT
 
@@ -96,220 +60,121 @@
     void destroyed();
 };
 
-class UbuntuLocationService::Priv : public QObject
-{
-Q_OBJECT
-
-public:
-    Priv() :
-            m_lastLocationMutex(QMutex::Recursive), m_resultMutex(
-                    QMutex::Recursive)
-    {
-    }
-
-    void init(const GeoIp::Ptr& geoIp)
-    {
-        m_geoIp = geoIp;
-        m_geoIp->whollyMoveThread(thread());
-
-        m_deactivateTimer.moveToThread(thread());
-        m_deactivateTimer.setInterval(DEACTIVATE_INTERVAL);
-        m_deactivateTimer.setSingleShot(true);
-        m_deactivateTimer.setTimerType(Qt::VeryCoarseTimer);
-
-        m_geoipTimer.moveToThread(thread());
-        m_geoipTimer.setInterval(GEOIP_INTERVAL);
-        m_geoipTimer.setTimerType(Qt::CoarseTimer);
-
-        QMetaObject::invokeMethod(m_geoIp.data(), "start", Qt::QueuedConnection);
-
-        try
-        {
-            m_bus = make_shared<dbus::Bus>(dbus::WellKnownBus::system);
-            m_bus->install_executor(dbus::asio::make_executor(m_bus));
-
-            m_dbusThread.reset(new DBusThread(m_bus));
-            m_dbusThread->start();
-
-            m_locationService = dbus::resolve_service_on_bus<culs::Interface,
-                    culs::Stub>(m_bus);
-        }
-        catch (exception& e)
-        {
-            qWarning() << e.what();
-        }
-
-        // Wire up the deactivate timer
-        connect(&m_deactivateTimer, &QTimer::timeout, this, &Priv::update, Qt::QueuedConnection);
-
-        // Wire up the network request finished timer
-        connect(m_geoIp.data(), &GeoIp::finished, this, &Priv::requestFinished, Qt::QueuedConnection);
-
-        // Wire up the GeoIP repeat timer
-        connect(&m_geoipTimer, &QTimer::timeout, m_geoIp.data(), &GeoIp::start, Qt::QueuedConnection);
-    }
-
-    ~Priv()
-    {
-        if (m_bus)
-        {
-            m_bus->stop();
-        }
-
-        if (m_dbusThread && m_dbusThread->isRunning())
-        {
-            m_dbusThread->wait();
-        }
-    }
-
-Q_SIGNALS:
-    void locationChanged();
-
-public Q_SLOTS:
-    void update()
-    {
-        if (!m_locationService)
-        {
-            qWarning() << "Location service not available";
-            return;
-        }
-
-        if (m_activationCount > 0)
-        {
-            // Update the GeoIp data again
-            m_geoIp->start();
-        }
-
-        try
-        {
-            if (!m_session)
-            {
-                m_session = m_locationService->create_session_for_criteria(
-                        cul::Criteria());
-
-                m_session->updates().position.changed().connect(
-                        bind(&UbuntuLocationService::Priv::positionChanged,
-                             this, _1));
-            }
-
-            if (m_activationCount > 0
-                    && m_session->updates().position_status
-                            == culss::Interface::Updates::Status::disabled)
-            {
-                qDebug() << "Enabling location updates";
-                m_session->updates().position_status =
-                        culss::Interface::Updates::Status::enabled;
-                m_geoipTimer.start();
-            }
-            else if (m_activationCount == 0
-                    && m_session->updates().position_status
-                            == culss::Interface::Updates::Status::enabled)
-            {
-                qDebug() << "Disabling location updates";
-                m_session->updates().position_status =
-                        culss::Interface::Updates::Status::disabled;
-                m_geoipTimer.stop();
-            }
-        }
-        catch (exception& e)
-        {
-            qWarning() << e.what();
-        }
-    }
-
-    void positionChanged(const cul::Update<cul::Position>& newPosition)
-    {
-        QMutexLocker lock(&m_lastLocationMutex);
-
-        m_locationUpdatedAtLeastOnce = true;
-        m_lastLocation = newPosition.value;
-        Q_EMIT locationChanged();
-    }
-
-    void requestFinished(const GeoIp::Result& result)
-    {
-        QMutexLocker lock(&m_resultMutex);
-        m_result = result;
-        Q_EMIT locationChanged();
-    }
-
-    void activate()
-    {
-        ++m_activationCount;
-        m_deactivateTimer.stop();
-        update();
-    }
-
-    void deactivate()
-    {
-        --m_activationCount;
-        if (m_activationCount < 0)
-        {
-            m_activationCount = 0;
-            qWarning() << "Location service refcount error";
-        }
-        m_deactivateTimer.start();
-    }
-
-public:
-    dbus::Bus::Ptr m_bus;
-
-    culs::Stub::Ptr m_locationService;
-
-    culss::Interface::Ptr m_session;
-
-    cul::Position m_lastLocation;
-
-    QMutex m_lastLocationMutex;
-
-    bool m_locationUpdatedAtLeastOnce = false;
-
-    int m_activationCount = 0;
-
-    QTimer m_geoipTimer;
-
-    QTimer m_deactivateTimer;
-
-    GeoIp::Ptr m_geoIp;
-
-    QSharedPointer<QThread> m_dbusThread;
-
-    QMutex m_resultMutex;
-
-    GeoIp::Result m_result;
-};
-
-UbuntuLocationService::UbuntuLocationService(const GeoIp::Ptr& geoIp) :
-        p(new Priv())
-{
-    p->moveToThread(&m_thread);
-
+UbuntuLocationService::UbuntuLocationService(const GeoIp::Ptr& geoIp)
+    : m_geoIp(geoIp)
+{
     // If the location service is disabled
     if (qEnvironmentVariableIsSet("UNITY_SCOPES_NO_LOCATION"))
     {
         return;
     }
 
-    p->init(geoIp);
+    m_deactivateTimer.setInterval(DEACTIVATE_INTERVAL);
+    m_deactivateTimer.setSingleShot(true);
+    m_deactivateTimer.setTimerType(Qt::VeryCoarseTimer);
+
+    m_geoipTimer.setInterval(GEOIP_INTERVAL);
+    m_geoipTimer.setTimerType(Qt::CoarseTimer);
+
+    m_locationSource = QGeoPositionInfoSource::createDefaultSource(this);
+    connect(m_locationSource, &QGeoPositionInfoSource::positionUpdated, this, &UbuntuLocationService::positionChanged);
+    connect(m_locationSource, &QGeoPositionInfoSource::updateTimeout, this, &UbuntuLocationService::onPositionUpdateTimeout);
+    connect(m_locationSource, SIGNAL(error(QGeoPositionInfoSource::Error)), this, SLOT(onError(QGeoPositionInfoSource::Error)));
+
+    // Wire up the deactivate timer
+    connect(&m_deactivateTimer, &QTimer::timeout, this, &UbuntuLocationService::update);
+
+    // Wire up the network request finished timer
+    connect(m_geoIp.data(), &GeoIp::finished, this, &UbuntuLocationService::requestFinished);
+
+    // Wire up the GeoIP repeat timer
+    connect(&m_geoipTimer, &QTimer::timeout, m_geoIp.data(), &GeoIp::start);
 
     // Connect to signals (which will be queued)
-    connect(p.data(), &Priv::locationChanged, this, &LocationService::locationChanged, Qt::QueuedConnection);
-    connect(this, &UbuntuLocationService::enqueueActivate, p.data(), &Priv::activate, Qt::QueuedConnection);
-    connect(this, &UbuntuLocationService::enqueueDeactivate, p.data(), &Priv::deactivate, Qt::QueuedConnection);
-
-    m_thread.start();
-}
-
-UbuntuLocationService::~UbuntuLocationService()
-{
-    p.reset();
-
-    m_thread.quit();
-
-    if (m_thread.isRunning())
-    {
-        m_thread.wait();
-    }
+    connect(this, &UbuntuLocationService::enqueueActivate, this, &UbuntuLocationService::doActivate, Qt::QueuedConnection);
+    connect(this, &UbuntuLocationService::enqueueDeactivate, this, &UbuntuLocationService::doDeactivate, Qt::QueuedConnection);
+
+    m_geoIp->start();
+}
+
+void UbuntuLocationService::doActivate()
+{
+    m_active = true;
+    ++m_activationCount;
+    m_deactivateTimer.stop();
+    update();
+}
+
+void UbuntuLocationService::doDeactivate()
+{
+    --m_activationCount;
+    if (m_activationCount < 0)
+    {
+        m_activationCount = 0;
+        qWarning() << "Location service refcount error";
+    }
+    m_deactivateTimer.start();
+}
+
+void UbuntuLocationService::update()
+{
+    if (m_activationCount > 0)
+    {
+        // Update the GeoIp data again
+        m_geoIp->start();
+    }
+
+    try
+    {
+        if (m_activationCount > 0)
+        {
+            qDebug() << "Enabling location updates";
+            m_locationSource->startUpdates();
+            m_geoipTimer.start();
+        }
+        else
+        {
+            qDebug() << "Disabling location updates";
+            m_active = false;
+            m_locationSource->stopUpdates();
+            m_geoipTimer.stop();
+        }
+    }
+    catch (exception& e)
+    {
+        qWarning() << e.what();
+    }
+}
+
+void UbuntuLocationService::positionChanged(const QGeoPositionInfo& update)
+{
+    m_locationUpdatedAtLeastOnce = true;
+    m_lastLocation = update;
+    Q_EMIT locationChanged();
+}
+
+void UbuntuLocationService::onPositionUpdateTimeout()
+{
+    qWarning() << "Position update timeout";
+    Q_EMIT locationTimeout();
+}
+
+void UbuntuLocationService::onError(QGeoPositionInfoSource::Error positioningError)
+{
+    qWarning() << "Position update error:" << positioningError;
+    if (positioningError == QGeoPositionInfoSource::AccessError) {
+        qDebug() << "Postion update denied";
+        Q_EMIT accessDenied();
+    }
+}
+
+void UbuntuLocationService::requestFinished(const GeoIp::Result& result)
+{
+    qDebug() << "GeoIP request finished";
+    {
+        m_result = result;
+    }
+    Q_EMIT geoIpLookupFinished();
 }
 
 scopes::Location UbuntuLocationService::location() const
@@ -318,8 +183,7 @@
 
     GeoIp::Result result;
     {
-        QMutexLocker lock(&p->m_resultMutex);
-        result = p->m_result;
+        result = m_result;
     }
 
     if (result.valid)
@@ -336,28 +200,21 @@
         location.set_city(result.city.toStdString());
     }
 
-    QMutexLocker lock(&p->m_lastLocationMutex);
     // We need to be active, and the location session must have updated at least once
-    if (isActive() && p->m_locationUpdatedAtLeastOnce)
+    if (isActive() && m_locationUpdatedAtLeastOnce)
     {
-        cul::Position pos = p->m_lastLocation;
-
-        if (pos.accuracy.horizontal)
-        {
-            location.set_horizontal_accuracy(pos.accuracy.horizontal.get().value());
-        }
-        if (pos.accuracy.vertical)
-        {
-            location.set_vertical_accuracy(pos.accuracy.vertical.get().value());
-        }
-
-        if (pos.altitude)
-        {
-            location.set_altitude(pos.altitude.get().value.value());
-        }
-
-        location.set_latitude(pos.latitude.value.value());
-        location.set_longitude(pos.longitude.value.value());
+        location.set_latitude(m_lastLocation.coordinate().latitude());
+        location.set_longitude(m_lastLocation.coordinate().longitude());
+        location.set_altitude(m_lastLocation.coordinate().altitude());
+
+        if (m_lastLocation.hasAttribute(QGeoPositionInfo::HorizontalAccuracy))
+        {
+            location.set_horizontal_accuracy(m_lastLocation.attribute(QGeoPositionInfo::HorizontalAccuracy));
+        }
+        if (m_lastLocation.hasAttribute(QGeoPositionInfo::VerticalAccuracy))
+        {
+            location.set_vertical_accuracy(m_lastLocation.attribute(QGeoPositionInfo::VerticalAccuracy));
+        }
     }
     else if (result.valid)
     {
@@ -376,18 +233,24 @@
 
 bool UbuntuLocationService::isActive() const
 {
-    return p->m_session ? (p->m_session->updates().position_status ==
-            culss::Interface::Updates::Status::enabled) : false;
+    return m_active;
 }
 
 bool UbuntuLocationService::hasLocation() const
 {
-    return p->m_result.valid || p->m_locationUpdatedAtLeastOnce;
+    return m_lastLocation.isValid() || m_locationUpdatedAtLeastOnce;
 }
 
-QSharedPointer<LocationService::Token> UbuntuLocationService::activate()
+QSharedPointer<UbuntuLocationService::Token> UbuntuLocationService::activate()
 {
     return QSharedPointer<Token>(new TokenImpl(*this));
 }
 
+void UbuntuLocationService::requestInitialLocation()
+{
+    qDebug() << "Requesting initial location update";
+    m_locationSource->requestUpdate();
+    m_geoipTimer.start();
+}
+
 #include "ubuntulocationservice.moc"

=== modified file 'src/Unity/ubuntulocationservice.h'
--- src/Unity/ubuntulocationservice.h	2015-09-08 12:32:05 +0000
+++ src/Unity/ubuntulocationservice.h	2016-06-10 15:06:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2016 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
@@ -15,50 +15,80 @@
  *
  * Authors:
  *  Pete Woods <[e-mail]>
+ *  Pawel Stolowski <[e-mail]>
  */
 
 #ifndef UBUNTULOCATIONSERVICE_H
 #define UBUNTULOCATIONSERVICE_H
 
 #include "geoip.h"
-#include "locationservice.h"
 
+#include <QObject>
 #include <QSharedPointer>
-#include <QThread>
+#include <QTimer>
+#include <QGeoPositionInfo>
+#include <QGeoPositionInfoSource>
+#include <unity/scopes/Location.h>
 
 namespace scopes_ng
 {
 
-class Q_DECL_EXPORT UbuntuLocationService : public LocationService
+class Q_DECL_EXPORT UbuntuLocationService: public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(unity::scopes::Location location READ location NOTIFY locationChanged)
+    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
 
 public:
+    typedef QSharedPointer<UbuntuLocationService> Ptr;
+    class Token : public QObject
+    {
+    };
+
     class TokenImpl;
 
     UbuntuLocationService(const GeoIp::Ptr& geoIp = GeoIp::Ptr(new GeoIp));
-
-    virtual ~UbuntuLocationService();
-
-    unity::scopes::Location location() const override;
-
-    bool hasLocation() const override;
-
-    bool isActive() const override;
-
-    QSharedPointer<Token> activate() override;
+    unity::scopes::Location location() const;
+    bool hasLocation() const;
+    bool isActive() const;
+    QSharedPointer<Token> activate();
+
+public Q_SLOTS:
+    void requestInitialLocation();
 
 Q_SIGNALS:
+    // emited when location changes and only when access has been granted by apparmor
+    void locationChanged();
+
+    void locationTimeout();
+
+    // emited when geoip lookup finishes (including initial lookup on startup). regardless of apparmor permissions
+    // (receiving it doesn't mean position updates are allowed).
+    void geoIpLookupFinished();
+    void activeChanged();
+    void accessDenied();
     void enqueueActivate();
-
     void enqueueDeactivate();
 
+protected Q_SLOTS:
+    void doActivate();
+    void doDeactivate();
+    void update();
+    void positionChanged(const QGeoPositionInfo& update);
+    void onPositionUpdateTimeout();
+    void onError(QGeoPositionInfoSource::Error positioningError);
+    void requestFinished(const GeoIp::Result& result);
+
 protected:
-    class Priv;
-
-    QThread m_thread;
-
-    QSharedPointer<Priv> p;
+    bool m_active;
+    QGeoPositionInfoSource *m_locationSource;
+    QGeoPositionInfo m_lastLocation;
+    bool m_locationUpdatedAtLeastOnce = false;
+    int m_activationCount = 0;
+    QTimer m_geoipTimer;
+    QTimer m_deactivateTimer;
+    GeoIp::Ptr m_geoIp;
+    GeoIp::Result m_result;
 };
 
 } // namespace scopes_ng

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-04-01 10:38:21 +0000
+++ tests/CMakeLists.txt	2016-06-10 15:06:19 +0000
@@ -7,7 +7,6 @@
 add_subdirectory(data)
 
 add_definitions(
-    -DGEOIP_SERVER_BINARY="${CMAKE_CURRENT_SOURCE_DIR}/geoip.ubuntu.com.py"
     -DTEST_DATA_DIR="${TEST_DATA_DIR}"
     -DTEST_RUNTIME_CONFIG="${TEST_RUNTIME_CONFIG}"
     -DTEST_SETTINGS_UNICODE="${CMAKE_CURRENT_SOURCE_DIR}/data/settings-unicode.ini"
@@ -18,7 +17,6 @@
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${SCOPESLIB_INCLUDE_DIRS}
-    ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}
     ${QTDBUSTEST_INCLUDE_DIRS}
     ${QTDBUSMOCK_INCLUDE_DIRS}
     ${GSETTINGSQT_INCLUDE_DIRS}
@@ -65,7 +63,6 @@
     filtersendtoendtest
     optionselectorfiltertest
     favoritestest
-    locationtest
     overviewtest
     previewtest
     resultstest

=== removed file 'tests/geoip.ubuntu.com.py'
--- tests/geoip.ubuntu.com.py	2014-07-23 11:10:53 +0000
+++ tests/geoip.ubuntu.com.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2014 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Pete Woods <[e-mail]>
-
-import tornado.httpserver
-import tornado.ioloop
-import tornado.netutil
-import tornado.web
-import sys
-
-RESPONSE = '''<Response>
-<Ip>1.2.3.4</Ip>
-<Status>OK</Status>
-<CountryCode>GB</CountryCode>
-<CountryCode3>GBR</CountryCode3>
-<CountryName>United Kingdom</CountryName>
-<RegionCode>H2</RegionCode>
-<RegionName>Lancashire</RegionName>
-<City>Accrington</City>
-<ZipPostalCode>BB5</ZipPostalCode>
-<Latitude>55.7654</Latitude>
-<Longitude>-2.7467</Longitude>
-<AreaCode>0</AreaCode>
-<TimeZone>Europe/London</TimeZone>
-</Response>
-'''
-
-class Lookup(tornado.web.RequestHandler):
-    def get(self):
-        sys.stderr.write('GeoIP location requested\n')
-        sys.stderr.flush()
-
-        self.write(RESPONSE)
-        self.finish()
-        
-def new_app():
-    application = tornado.web.Application([
-        (r"/lookup", Lookup),
-    ], gzip=True)
-    sockets = tornado.netutil.bind_sockets(0, '127.0.0.1')
-    server = tornado.httpserver.HTTPServer(application)
-    server.add_sockets(sockets)
-
-    sys.stdout.write('%d\n' % sockets[0].getsockname()[1])
-    sys.stdout.flush()
-
-    return application
-
-if __name__ == "__main__":
-    application = new_app()
-    tornado.ioloop.IOLoop.instance().start()

=== removed file 'tests/locationtest.cpp'
--- tests/locationtest.cpp	2015-02-26 18:02:32 +0000
+++ tests/locationtest.cpp	1970-01-01 00:00:00 +0000
@@ -1,234 +0,0 @@
-/*
- * Copyright (C) 2013-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/>.
- *
- * Authors:
- *  Pete Woods <[e-mail]>
- */
-
-#include "ubuntulocationservice.h"
-
-#include <QProcess>
-#include <QSignalSpy>
-#include <QTest>
-#include <string>
-
-#include <libqtdbusmock/DBusMock.h>
-#include <libqtdbustest/DBusTestRunner.h>
-
-using namespace std;
-using namespace scopes_ng;
-using namespace unity::scopes;
-using namespace QtDBusTest;
-using namespace QtDBusMock;
-
-namespace
-{
-
-static const char* LOCATION_SERVICE_NAME = "com.ubuntu.location.Service";
-static const char* LOCATION_SERVICE_PATH = "/com/ubuntu/location/Service";
-static const char* LOCATION_SERVICE_INTERFACE = "com.ubuntu.location.Service";
-
-static const char* SESSION_NAME = "com.ubuntu.location.Service.Session";
-static const QString SESSION_PATH = "/com/ubuntu/location/session/%1";
-static const QString SESSION_INTERFACE = "com.ubuntu.location.Service.Session";
-
-static Variant geoip()
-{
-    VariantMap result;
-    result["area_code"] = "0";
-    result["city"] = "Accrington";
-    result["country_code"] = "GB";
-    result["country_name"] = "United Kingdom";
-    result["horizontal_accuracy"] = 100000.0;
-    result["latitude"] = 55.76540;
-    result["longitude"] = -2.74670;
-    result["region_code"] = "H2";
-    result["region_name"] = "Lancashire";
-    result["zip_postal_code"] = "BB5";
-    return Variant(result);
-}
-
-static Variant gps()
-{
-    VariantMap result;
-    result["altitude"] = 3.0;
-    result["area_code"] = "0";
-    result["city"] = "Accrington";
-    result["country_code"] = "GB";
-    result["country_name"] = "United Kingdom";
-    result["horizontal_accuracy"] = 4.0;
-    result["latitude"] = 1.0;
-    result["longitude"] = 2.0;
-    result["region_code"] = "H2";
-    result["region_name"] = "Lancashire";
-    result["vertical_accuracy"] = 5.0;
-    result["zip_postal_code"] = "BB5";
-    return Variant(result);
-}
-
-class LocationTest: public QObject
-{
-Q_OBJECT
-
-public:
-    LocationTest() :
-            mock(dbus)
-    {
-    }
-
-private:
-    OrgFreedesktopDBusMockInterface& interface()
-    {
-        return mock.mockInterface(LOCATION_SERVICE_NAME, LOCATION_SERVICE_PATH,
-                                  LOCATION_SERVICE_INTERFACE,
-                                  QDBusConnection::SystemBus);
-    }
-
-    OrgFreedesktopDBusMockInterface& session(int id)
-    {
-        return mock.mockInterface(SESSION_NAME, SESSION_PATH.arg(id),
-                                  SESSION_INTERFACE, QDBusConnection::SystemBus);
-    }
-
-    DBusTestRunner dbus;
-
-    DBusMock mock;
-
-    QScopedPointer<LocationService> locationService;
-
-    QProcess geoIpServer;
-
-    QUrl url;
-
-private Q_SLOTS:
-    void initTestCase()
-    {
-        DBusMock::registerMetaTypes();
-
-        // Register the main interface object
-        mock.registerCustomMock(LOCATION_SERVICE_NAME, LOCATION_SERVICE_PATH,
-                                LOCATION_SERVICE_INTERFACE,
-                                QDBusConnection::SystemBus);
-
-        // Register the first session object
-        mock.registerCustomMock(SESSION_NAME, SESSION_PATH.arg(0),
-                                SESSION_INTERFACE,
-                                QDBusConnection::SystemBus);
-
-        dbus.startServices();
-
-        // Set up the main interface
-        {
-            interface().AddMethod(LOCATION_SERVICE_INTERFACE,
-                                "CreateSessionForCriteria", "bbbbdbbb", "o",
-                                "ret='/com/ubuntu/location/session/0'");
-        }
-
-        // Set up the first session
-        {
-            session(0).AddMethod(SESSION_INTERFACE, "StartPositionUpdates", "", "", "");
-            session(0).AddMethod(SESSION_INTERFACE, "StopPositionUpdates", "", "", "");
-        }
-
-        geoIpServer.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-        geoIpServer.start(GEOIP_SERVER_BINARY);
-        QVERIFY(geoIpServer.waitForStarted());
-        QVERIFY(geoIpServer.waitForReadyRead());
-
-        url = "http://127.0.0.1:" + geoIpServer.readAllStandardOutput().trimmed() + "/lookup";
-    }
-
-    void cleanupTestCase() {
-        geoIpServer.terminate();
-        QVERIFY(geoIpServer.waitForFinished());
-    }
-
-    void init()
-    {
-        locationService.reset(new UbuntuLocationService(GeoIp::Ptr(new GeoIp(url))));
-    }
-
-    void cleanup()
-    {
-        locationService.reset();
-    }
-
-    void compareVariant(const Variant& expected_in, const Variant& actual_in)
-    {
-        VariantMap expected(expected_in.get_dict());
-        VariantMap actual(actual_in.get_dict());
-
-        QVERIFY2(
-                expected.size() <= actual.size(),
-                qPrintable(QString("We need at least %1 entries, had %2").arg(
-                        expected.size()).arg(actual.size())));
-        for(const auto entry: expected)
-        {
-            QVERIFY(actual.find(entry.first) != actual.end());
-
-            Variant expectedVariant = entry.second;
-            Variant actualVariant = actual[entry.first];
-
-            if (expectedVariant.which() == Variant::Double)
-            {
-                bool comparison = qFuzzyCompare(expectedVariant.get_double(), actualVariant.get_double());
-                if (!comparison)
-                {
-                    qWarning() << "Comparison:" << expectedVariant.get_double() << "!=" << actualVariant.get_double();
-                }
-                QVERIFY(comparison);
-            }
-            else
-            {
-                QCOMPARE(expectedVariant, actualVariant);
-            }
-        }
-    }
-
-    void testLocation()
-    {
-        QSignalSpy spy(locationService.data(), SIGNAL(locationChanged()));
-        auto token = locationService->activate();
-
-        // The GeoIP HTTP call should return now
-        QVERIFY(spy.wait());
-        compareVariant(geoip(), Variant(locationService->location().serialize()));
-
-        // Call the object that the location service client creates
-        QDBusInterface remoteObject(":1.4", SESSION_PATH.arg(0), SESSION_INTERFACE,
-                                    QDBusConnection::systemBus());
-
-        QString errorMessage("never called");
-        for (int i = 0; i < 10 && !errorMessage.isEmpty(); ++i)
-        {
-            QDBusMessage reply = remoteObject.callWithArgumentList(
-                    QDBus::Block,
-                    "UpdatePosition",
-                    QVariantList() << 1.0 << 2.0 << true << 3.0 << true << 4.0
-                            << true << 5.0 << qint64(1234));
-            errorMessage = reply.errorMessage();
-        }
-        QCOMPARE(QString(), errorMessage);
-
-        // The GPS update should return now
-        QVERIFY(spy.wait());
-        QTRY_COMPARE((unsigned int) locationService->location().serialize().size(), 12u);
-        compareVariant(gps(), Variant(locationService->location().serialize()));
-    }
-};
-
-}
-QTEST_GUILESS_MAIN(LocationTest)
-#include <locationtest.moc>