Merge lp:~thomas-voss/location-service/rework-dbus-bits into lp:location-service

[Thomas Voß]

Rework dbus-related code to rely on GDBus.

Rework dbus-related code to rely on GDBus.

[Simon Fels (morphis)]

One comment inline, otherwise LGTM

[Simon Fels (morphis)]

LGTM!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-10 09:15:40 +0000
+++ CMakeLists.txt	2017-03-08 11:32:35 +0000
@@ -23,11 +23,11 @@
   #   - errors
   # we define the version to be 2.0.0
   if (${DISTRO_CODENAME} STREQUAL "vivid")
-    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
     set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
     set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
   else ()
-    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 4)
     set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
     set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
   endif()
@@ -38,7 +38,7 @@
 set(UBUNTU_LOCATION_SERVICE_TRUST_STORE_SERVICE_NAME "UbuntuLocationService")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -fPIC")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -65,6 +65,8 @@
 pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
 pkg_check_modules(TRUST_STORE trust-store REQUIRED)
 pkg_check_modules(UBUNTU_PLATFORM_HARDWARE_API ubuntu-platform-hardware-api)
+pkg_check_modules(GIO gio-2.0)
+pkg_check_modules(GIO_UNIX gio-unix-2.0)
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
 # Usage:
@@ -114,6 +116,8 @@
   ${TRUST_STORE_INCLUDE_DIRS}
   ${GLog_INCLUDE_DIR}
   ${GFlags_INCLUDE_DIR}
+  ${GIO_INCLUDE_DIRS}
+  ${GIO_UNIX_INCLUDE_DIRS}
 
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/src

=== modified file 'debian/VERSION'
--- debian/VERSION	2016-03-11 11:01:55 +0000
+++ debian/VERSION	2017-03-08 11:32:35 +0000
@@ -1,1 +1,1 @@
-3.0.0
\ No newline at end of file
+4.0.0

=== modified file 'debian/VERSION.vivid'
--- debian/VERSION.vivid	2016-03-11 11:01:55 +0000
+++ debian/VERSION.vivid	2017-03-08 11:32:35 +0000
@@ -1,1 +1,1 @@
-2.0.0
+3.0.0

=== modified file 'debian/control'
--- debian/control	2016-06-27 06:44:50 +0000
+++ debian/control	2017-03-08 11:32:35 +0000
@@ -22,6 +22,7 @@
                libboost-system-dev,
                libdbus-1-dev,
                libdbus-cpp-dev,
+               libglib2.0-dev,
                libgoogle-glog-dev,
                libgtest-dev,
                libiw-dev,

=== modified file 'debian/control.in'
--- debian/control.in	2016-03-11 11:01:55 +0000
+++ debian/control.in	2017-03-08 11:32:35 +0000
@@ -17,6 +17,7 @@
                libboost-system-dev,
                libdbus-1-dev,
                libdbus-cpp-dev,
+               libglib2.0-dev,
                libgoogle-glog-dev,
                libgtest-dev,
                libiw-dev,

=== modified file 'include/location/connectivity/manager.h'
--- include/location/connectivity/manager.h	2016-08-24 14:12:05 +0000
+++ include/location/connectivity/manager.h	2017-03-08 11:32:35 +0000
@@ -225,6 +225,13 @@
  * @return An instance of a connectivity manager.
  */
 LOCATION_DLL_PUBLIC const std::shared_ptr<Manager>& platform_default_manager();
+
+/**
+ * @brief Provides access to a platform-specific implementation/instance of a connectivity manager.
+ * @throw Manager::Errors::ConnectivityManagementNotSupported.
+ */
+LOCATION_DLL_PUBLIC void platform_default_manager(const std::function<void(const std::shared_ptr<Manager>&)>& cb);
+
 }
 }
 }

=== modified file 'include/location/connectivity/wireless_network.h'
--- include/location/connectivity/wireless_network.h	2016-08-24 14:12:05 +0000
+++ include/location/connectivity/wireless_network.h	2017-03-08 11:32:35 +0000
@@ -70,8 +70,9 @@
     typedef BoundedInteger
     <
         Tag::SignalStrength,
-        0,
-        100
+        std::numeric_limits<int>::min(),
+        std::numeric_limits<int>::max(),
+        std::numeric_limits<int>::max()
     > SignalStrength;
 
     /** @cond */

=== modified file 'include/location/service.h'
--- include/location/service.h	2016-08-24 14:12:05 +0000
+++ include/location/service.h	2017-03-08 11:32:35 +0000
@@ -143,12 +143,11 @@
     virtual void add_provider(const Provider::Ptr& provider) = 0;
 
     /**
-     * @brief Starts a new session for the given criteria
-     * @throw std::runtime_error in case of errors.
-     * @param criteria The client's requirements in terms of accuraccy and functionality
-     * @return A session instance.
-     */
-    virtual Session::Ptr create_session_for_criteria(const Criteria& criteria) = 0;
+      * @brief Starts a new session for the given criteria
+      * @param critiera The client's requirements in terms of accuracy and functionality
+      * @param cb Callback functor that is invoked once the session has been created
+      */
+    virtual void create_session_for_criteria(const Criteria& criteria, const std::function<void(const Session::Ptr&)>& cb) = 0;
 
 protected:
     Service() = default;

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-01-06 09:51:21 +0000
+++ snapcraft.yaml	2017-03-08 11:32:35 +0000
@@ -1,12 +1,9 @@
 name: locationd
-version: 3.0.0+16.10.20160616-0ubuntu1
+version: 4.0.0
 confinement: strict
 summary: Location service mediates access to positioning providers.
 description: |
   Location service mediates access to positioning providers.
-  
-  **Note** Currently only the dummy provider is supported in this snap. Additional
-  providers will be made available in the near future.
 
   Please find the source for this snap at https://code.launchpad.net/location-service
 
@@ -50,7 +47,7 @@
     configflags:
       - -DCMAKE_VERBOSE_MAKEFILE=ON
       - -DSNAPPY_UBUNTU_CORE=yes
-      - -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=3
+      - -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=4
     source: .
     build-packages:
       - curl
@@ -68,6 +65,7 @@
       - libc6-dev
       - libdbus-1-dev
       - libdbus-cpp-dev
+      - libglib2.0-dev
       - libgoogle-glog-dev
       - libgtest-dev
       - libiw-dev
@@ -87,6 +85,7 @@
       - libboost-system1.58.0
       - libdbus-cpp5
       - libgflags2v5
+      - libglib2.0-0
       - libgoogle-glog0v5
       - libjson-c2
       - libnet-cpp2

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-06-26 21:17:03 +0000
+++ src/CMakeLists.txt	2017-03-08 11:32:35 +0000
@@ -1,1 +1,1 @@
-add_subdirectory(location)
\ No newline at end of file
+add_subdirectory(location)

=== modified file 'src/location/CMakeLists.txt'
--- src/location/CMakeLists.txt	2016-08-26 13:11:26 +0000
+++ src/location/CMakeLists.txt	2017-03-08 11:32:35 +0000
@@ -8,7 +8,31 @@
   config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY
 )
 
-include_directories(${UBUNTU_PLATFORM_HARDWARE_API_INCLUDE_DIRS})
+include_directories(
+    ${CMAKE_BINARY_DIR}/src
+    ${UBUNTU_PLATFORM_HARDWARE_API_INCLUDE_DIRS})
+
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/dbus")
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/providers/remote")
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/connectivity")
+
+find_program(GDBUS_CODEGEN_EXECUTABLE NAMES gdbus-codegen)
+
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dbus/service_gen.h" "${CMAKE_CURRENT_BINARY_DIR}/dbus/service_gen.c"
+  COMMAND ${GDBUS_CODEGEN_EXECUTABLE} --generate-c-code "${CMAKE_CURRENT_BINARY_DIR}/dbus/service_gen" "${CMAKE_CURRENT_SOURCE_DIR}/dbus/service.xml")
+
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dbus/session_gen.h" "${CMAKE_CURRENT_BINARY_DIR}/dbus/session_gen.c"
+  COMMAND ${GDBUS_CODEGEN_EXECUTABLE} --c-generate-object-manager --generate-c-code "${CMAKE_CURRENT_BINARY_DIR}/dbus/session_gen" "${CMAKE_CURRENT_SOURCE_DIR}/dbus/session.xml")
+
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/providers/remote/provider_gen.h" "${CMAKE_CURRENT_BINARY_DIR}/providers/remote/provider_gen.c"
+  COMMAND ${GDBUS_CODEGEN_EXECUTABLE} --generate-c-code "${CMAKE_CURRENT_BINARY_DIR}/providers/remote/provider_gen" "${CMAKE_CURRENT_SOURCE_DIR}/providers/remote/provider.xml")
+
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/connectivity/w11t_gen.h" "${CMAKE_CURRENT_BINARY_DIR}/connectivity/w11t_gen.c"
+  COMMAND ${GDBUS_CODEGEN_EXECUTABLE} --generate-c-code "${CMAKE_CURRENT_BINARY_DIR}/connectivity/w11t_gen" "${CMAKE_CURRENT_SOURCE_DIR}/connectivity/w11t.xml")
 
 add_library(
   ubuntu-location-service SHARED
@@ -24,7 +48,7 @@
   features.cpp
   position.cpp
   provider.cpp
-  provider_factory.cpp
+  provider_factory.cpp  
   satellite_based_positioning_state.cpp
   settings.cpp
   space_vehicle.cpp
@@ -39,7 +63,7 @@
   daemon.h
   daemon.cpp
   service.cpp
-
+  result.h
   permission_manager.h
   runtime.h
   runtime.cpp
@@ -52,9 +76,6 @@
   session_with_provider.h
   session_with_provider.cpp
 
-  trust_store_permission_manager.h
-  trust_store_permission_manager.cpp
-
   cmds/list.h
   cmds/list.cpp
   cmds/monitor.h
@@ -71,8 +92,18 @@
   util/cli.h
   util/cli.cpp
   util/do_not_copy_or_move.h
-  util/well_known_bus.h
-  util/well_known_bus.cpp
+
+  "${CMAKE_CURRENT_BINARY_DIR}/dbus/service_gen.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/dbus/service_gen.c"
+
+  "${CMAKE_CURRENT_BINARY_DIR}/dbus/session_gen.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/dbus/session_gen.c"
+
+  dbus/bus.h
+  dbus/bus.cpp
+  dbus/codec.h
+  dbus/codec.cpp
+  dbus/util.h
 
   dbus/skeleton/service.h
   dbus/skeleton/service.cpp
@@ -90,17 +121,28 @@
   events/reference_position_updated.cpp
   events/wifi_and_cell_id_reporting_state_changed.cpp
 
+  glib/holder.h
+  glib/runtime.h
+  glib/runtime.cpp
+  glib/serializing_bus.h
+  glib/serializing_bus.cpp
+  glib/shared_object.h
+  glib/util.h
+  glib/util.cpp
+
   providers/config.cpp
 
   providers/fusion/provider.h
   providers/fusion/provider.cpp
-  providers/remote/provider.cpp
-  providers/remote/skeleton.cpp
-  providers/remote/stub.cpp
   providers/proxy.h
   providers/proxy.cpp
   providers/state_tracking_provider.h
   providers/state_tracking_provider.cpp
+
+  "${CMAKE_CURRENT_BINARY_DIR}/providers/remote/provider_gen.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/providers/remote/provider_gen.c"
+  providers/remote/provider.h
+  providers/remote/provider.cpp
 )
 
 add_library(
@@ -108,13 +150,17 @@
 
   set_name_for_thread.cpp
 
-  connectivity/cached_radio_cell.cpp
-  connectivity/cached_wireless_network.cpp
+  glib/util.h
+  glib/util.cpp
+
   connectivity/manager.cpp
   connectivity/radio_cell.cpp
   connectivity/wireless_network.cpp
 
-  connectivity/ofono_nm_connectivity_manager.cpp
+  connectivity/w11t_manager.h
+  connectivity/w11t_manager.cpp
+  "${CMAKE_CURRENT_BINARY_DIR}/connectivity/w11t_gen.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/connectivity/w11t_gen.c"
 )
 
 set(symbol_map "${CMAKE_SOURCE_DIR}/symbols.map")
@@ -151,6 +197,7 @@
   ${PROCESS_CPP_LDFLAGS}
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
+  ${GIO_LDFLAGS}
 )
 
 target_link_libraries(
@@ -171,6 +218,7 @@
   ${UBUNTU_PLATFORM_HARDWARE_API_LDFLAGS}
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
+  ${GIO_LDFLAGS}
 )
 
 install(

=== modified file 'src/location/cmds/monitor.cpp'
--- src/location/cmds/monitor.cpp	2016-12-12 09:21:48 +0000
+++ src/location/cmds/monitor.cpp	2017-03-08 11:32:35 +0000
@@ -21,32 +21,13 @@
 
 #include <location/criteria.h>
 #include <location/dbus/stub/service.h>
+#include <location/glib/runtime.h>
 #include <location/runtime.h>
-#include <location/util/well_known_bus.h>
-
-#include <core/dbus/asio/executor.h>
-#include <core/posix/signal.h>
 
 #include <type_traits>
 
 namespace cli = location::util::cli;
 
-namespace
-{
-struct Retry
-{
-    template<unsigned int retry_count, typename Operation>
-    static auto times(const Operation& op) -> typename std::result_of<Operation>::type
-    {
-        for (unsigned int count = 0; count < retry_count; count++)
-            try { return op(); }
-            catch(...) {}
-
-        throw std::runtime_error{"Operation failed"};
-    }
-};
-}
-
 location::cmds::Monitor::PrintingDelegate::PrintingDelegate(std::ostream& out) : out{out}
 {
 }
@@ -69,59 +50,55 @@
 location::cmds::Monitor::Monitor(const std::shared_ptr<Delegate>& delegate)
     : CommandWithFlagsAndAction{cli::Name{"monitor"}, cli::Usage{"monitor"}, cli::Description{"monitors the daemon"}},
       delegate{delegate},
-      bus{core::dbus::WellKnownBus::system}
+      bus{dbus::Bus::system}
 {
     flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
     action([this](const Context& ctxt)
     {
-        // We exit cleanly for SIGINT and SIGTERM.
-        auto trap = core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_int, core::posix::Signal::sig_term});
-        trap->signal_raised().connect([trap](core::posix::Signal)
-        {
-            trap->stop();
-        });
-
-        auto rt = location::Runtime::create();
-
-        auto conn = std::make_shared<core::dbus::Bus>(bus);
-        conn->install_executor(core::dbus::asio::make_executor(conn, rt->service()));
-
-        rt->start();
-
-        core::dbus::Service::Ptr service = core::dbus::Service::use_service<location::dbus::Service>(conn);
-
-        auto stub = std::make_shared<location::dbus::stub::Service>(conn, service, service->object_for_path(core::dbus::types::ObjectPath{location::dbus::Service::path()}));
-        auto session = stub->create_session_for_criteria(location::Criteria{});
-
-        session->updates().position.changed().connect([this](const location::Update<location::Position>& pos)
-        {
-            Monitor::delegate->on_new_position(pos);
-        });
-
-        session->updates().heading.changed().connect([this](const location::Update<location::units::Degrees>& heading)
-        {
-            Monitor::delegate->on_new_heading(heading);
-        });
-
-        session->updates().velocity.changed().connect([this](const location::Update<location::units::MetersPerSecond>& velocity)
-        {
-            Monitor::delegate->on_new_velocity(velocity);
-        });
-
-        session->updates().position_status = location::Service::Session::Updates::Status::enabled;
-        session->updates().heading_status = location::Service::Session::Updates::Status::enabled;
-        session->updates().velocity_status = location::Service::Session::Updates::Status::enabled;
-
-        ctxt.cout << "Enabled position/heading/velocity updates..." << std::endl;
-
-        trap->run();
-
-        session->updates().position_status = location::Service::Session::Updates::Status::disabled;
-        session->updates().heading_status = location::Service::Session::Updates::Status::disabled;
-        session->updates().velocity_status = location::Service::Session::Updates::Status::disabled;
-
-        conn->stop(); rt->stop();
-
-        return EXIT_SUCCESS;
+        glib::Runtime runtime;
+
+        location::dbus::stub::Service::create(bus, [this, &ctxt](const Result<location::dbus::stub::Service::Ptr>& result) mutable
+        {
+            if (!result)
+            {
+                glib::Runtime::instance()->stop();
+                return;
+            }
+
+            auto service = result.value();
+            service->create_session_for_criteria(location::Criteria{}, [this, &ctxt, service](const Result<Service::Session::Ptr>& result)
+            {
+                if (!result)
+                {
+                    glib::Runtime::instance()->stop();
+                    return;
+                }
+
+                auto session = result.value();
+
+                session->updates().position.changed().connect([this, session](const location::Update<location::Position>& pos)
+                {
+                    Monitor::delegate->on_new_position(pos);
+                });
+
+                session->updates().heading.changed().connect([this, session](const location::Update<location::units::Degrees>& heading)
+                {
+                    Monitor::delegate->on_new_heading(heading);
+                });
+
+                session->updates().velocity.changed().connect([this, session](const location::Update<location::units::MetersPerSecond>& velocity)
+                {
+                    Monitor::delegate->on_new_velocity(velocity);
+                });
+
+                session->updates().position_status = location::Service::Session::Updates::Status::enabled;
+                session->updates().heading_status = location::Service::Session::Updates::Status::enabled;
+                session->updates().velocity_status = location::Service::Session::Updates::Status::enabled;
+
+                ctxt.cout << "Enabled position/heading/velocity updates..." << std::endl;
+            });
+        });
+
+        return runtime.run();
     });
 }

=== modified file 'src/location/cmds/monitor.h'
--- src/location/cmds/monitor.h	2016-08-24 14:12:05 +0000
+++ src/location/cmds/monitor.h	2017-03-08 11:32:35 +0000
@@ -25,10 +25,9 @@
 #include <location/update.h>
 #include <location/visibility.h>
 
+#include <location/dbus/bus.h>
 #include <location/util/cli.h>
 
-#include <location/util/well_known_bus.h>
-
 #include <iosfwd>
 
 namespace location
@@ -71,7 +70,7 @@
 
 private:
     std::shared_ptr<Delegate> delegate; // All updates are forwarded to a delegate.
-    core::dbus::WellKnownBus bus;       // The bus we should connect to.
+    dbus::Bus bus;                      // The bus we should connect to.
 };
 }
 }

=== modified file 'src/location/cmds/provider.cpp'
--- src/location/cmds/provider.cpp	2016-08-12 11:52:37 +0000
+++ src/location/cmds/provider.cpp	2017-03-08 11:32:35 +0000
@@ -20,13 +20,10 @@
 #include <location/cmds/provider.h>
 
 #include <location/provider_factory.h>
-#include <location/runtime.h>
 
 #include <location/dbus/stub/service.h>
-#include <location/providers/remote/skeleton.h>
+#include <location/glib/runtime.h>
 
-#include <core/dbus/service.h>
-#include <core/dbus/asio/executor.h>
 #include <core/posix/signal.h>
 
 namespace cli = location::util::cli;
@@ -41,7 +38,7 @@
 
 location::cmds::Provider::Provider()
     : CommandWithFlagsAndAction{cli::Name{"provider"}, cli::Usage{"provider"}, cli::Description{"executes a built-in provider"}},
-      bus{core::dbus::WellKnownBus::system}
+      bus{dbus::Bus::system}
 {
     flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
     flag(cli::make_flag(cli::Name{"id"}, cli::Description{"id of the actual provider implementation."}, id));
@@ -50,29 +47,21 @@
     {
         die_if(not id, ctxt.cout, "name of actual provider implementation is missing");
 
-        // We exit cleanly for SIGINT and SIGTERM.
-        auto trap = core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_term});
-        trap->signal_raised().connect([trap](core::posix::Signal)
+        glib::Runtime runtime;
+
+        location::dbus::stub::Service::create(bus, [this](const location::Result<location::dbus::stub::Service::Ptr>& result)
         {
-            trap->stop();
+            if (!result)
+            {
+                glib::Runtime::instance()->stop();
+                return;
+            }
+
+            service = result.value();
+            service->add_provider(location::ProviderFactory::instance().create_provider_for_name_with_config(
+                                      *id, location::Configuration{}));
         });
 
-        auto impl = location::ProviderFactory::instance().create_provider_for_name_with_config(*id, location::Configuration{});
-
-        auto rt = location::Runtime::create(); rt->start();
-
-        auto incoming = std::make_shared<core::dbus::Bus>(bus);
-        incoming->install_executor(core::dbus::asio::make_executor(incoming, rt->service()));
-
-        auto service = core::dbus::Service::use_service<location::dbus::Service>(incoming);
-        auto stub = std::make_shared<location::dbus::stub::Service>(incoming, service, service->object_for_path(core::dbus::types::ObjectPath{location::dbus::Service::path()}));
-
-        stub->add_provider(impl);
-
-        trap->run();
-
-        incoming->stop(); rt->stop();
-
-        return EXIT_SUCCESS;
+        return runtime.run();
     });
 }

=== modified file 'src/location/cmds/provider.h'
--- src/location/cmds/provider.h	2016-08-24 14:12:05 +0000
+++ src/location/cmds/provider.h	2017-03-08 11:32:35 +0000
@@ -21,8 +21,9 @@
 #define LOCATION_CMDS_PROVIDER_H_
 
 #include <location/optional.h>
+#include <location/service.h>
+#include <location/dbus/bus.h>
 #include <location/util/cli.h>
-#include <location/util/well_known_bus.h>
 #include <location/visibility.h>
 
 #include <boost/filesystem.hpp>
@@ -41,8 +42,9 @@
     Provider();
 
 private:
-    core::dbus::WellKnownBus bus;   // The bus we should connect to.
-    Optional<std::string> id;       // The id of the actual provider implementation.
+    dbus::Bus bus;              // The bus we should connect to.
+    Optional<std::string> id;   // The id of the actual provider implementation.
+    Service::Ptr service;       // The service instance.
 };
 }
 }

=== modified file 'src/location/cmds/run.cpp'
--- src/location/cmds/run.cpp	2016-12-12 09:21:48 +0000
+++ src/location/cmds/run.cpp	2017-03-08 11:32:35 +0000
@@ -21,27 +21,23 @@
 
 #include <location/boost_ptree_settings.h>
 #include <location/fusion_provider_selection_policy.h>
-#include <location/runtime.h>
 #include <location/serializing_bus.h>
 #include <location/service_with_engine.h>
 #include <location/settings.h>
 #include <location/system_configuration.h>
-#include <location/trust_store_permission_manager.h>
 
+#include <location/glib/runtime.h>
+#include <location/glib/serializing_bus.h>
 #include <location/dbus/skeleton/service.h>
 #include <location/providers/dummy/provider.h>
 #include <location/providers/ubx/provider.h>
-#include <location/util/well_known_bus.h>
-
-#include <core/dbus/asio/executor.h>
-#include <core/posix/signal.h>
 
 namespace cli = location::util::cli;
 
 location::cmds::Run::Run()
     : CommandWithFlagsAndAction{cli::Name{"run"}, cli::Usage{"run"}, cli::Description{"runs the daemon"}},
       testing{false},
-      bus{core::dbus::WellKnownBus::system},
+      bus{location::dbus::Bus::system},
       settings{SystemConfiguration::instance().runtime_persistent_data_dir()}
 {
     flag(cli::make_flag(cli::Name{"testing"}, cli::Description{"whether we are running under testing, defaults to false"}, testing));
@@ -53,14 +49,7 @@
     {
         account_for_lp1447110();
 
-        // We exit cleanly for SIGINT and SIGTERM.
-        auto trap = core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_term});
-        trap->signal_raised().connect([trap](core::posix::Signal)
-        {
-            trap->stop();
-        });        
-
-        auto rt = location::Runtime::create();
+        glib::Runtime runtime;
 
         // The engine instance is the core piece of functionality.
         auto engine = std::make_shared<location::Engine>(
@@ -68,7 +57,7 @@
             // fusioned and filtered updates to sessions.
             std::make_shared<location::FusionProviderSelectionPolicy>(),
             // We serialize all messages passed through our internal bus via a specific strand on the runtime.
-            location::SerializingBus::create(rt),
+            location::glib::SerializingBus::create(),
             // We default to a location::Settings implementation that reads state from
             // an ini file, immediately syncing back changes to the underlying file whenever
             // parameters change.
@@ -81,44 +70,16 @@
             engine->add_provider(std::make_shared<location::providers::dummy::Provider>());
         }
 
-        // TODO(tvoss): Make this dynamic and handled by an outer layer of infrastructure.
-        try {
-            engine->add_provider(location::providers::ubx::Provider::create_instance({}));
-        } catch (const std::exception& e) {
-            ctxt.cout << "Failed to instantiate ubx::Provider: " << e.what();
-        }
-
-        auto incoming = std::make_shared<core::dbus::Bus>(bus);
-        auto outgoing = std::make_shared<core::dbus::Bus>(bus);
-
-        incoming->install_executor(core::dbus::asio::make_executor(incoming, rt->service()));
-        outgoing->install_executor(core::dbus::asio::make_executor(outgoing, rt->service()));
-
-        auto service = core::dbus::Service::add_service<location::dbus::Service>(incoming);
-
         location::dbus::skeleton::Service::Configuration config
         {
+            bus,
             std::make_shared<location::ServiceWithEngine>(engine),
-            incoming,
-            outgoing,
-            service,
-            // We resolve credentials of incoming calls by talking back to the dbus daemon and subsequently
-            // querying apparmor for the confinement profile.
-            std::make_shared<location::dbus::skeleton::Service::DBusDaemonCredentialsResolver>(outgoing),
-            std::make_shared<location::dbus::skeleton::Service::ObjectPathGenerator>(),
-            // Incoming requests are verified by talking to a trust-store instance.
-            SystemConfiguration::instance().create_permission_manager(outgoing)
+            SystemConfiguration::instance().create_permission_manager()
         };
 
-        rt->start();
-
-        auto skeleton = std::make_shared<location::dbus::skeleton::Service>(config);
-
-        trap->run();
-
-        incoming->stop(); outgoing->stop(); rt->stop();
-
-        return EXIT_SUCCESS;
+        auto skeleton = location::dbus::skeleton::Service::create(config);
+
+        return runtime.run();
     });
 }
 

=== modified file 'src/location/cmds/run.h'
--- src/location/cmds/run.h	2016-08-24 14:12:05 +0000
+++ src/location/cmds/run.h	2017-03-08 11:32:35 +0000
@@ -20,9 +20,9 @@
 #ifndef LOCATION_CMDS_RUN_H_
 #define LOCATION_CMDS_RUN_H_
 
+#include <location/dbus/bus.h>
 #include <location/optional.h>
 #include <location/util/cli.h>
-#include <location/util/well_known_bus.h>
 #include <location/visibility.h>
 
 #include <boost/filesystem.hpp>
@@ -47,7 +47,7 @@
     void account_for_lp1447110() const;
 
     bool testing;                               // Whether we are running in a testing environment.
-    core::dbus::WellKnownBus bus;               // The bus we should connect to.
+    dbus::Bus bus;                              // The bus we should connect to.
     Optional<boost::filesystem::path> config;   // Optionally load configuration from this config file.
     boost::filesystem::path settings;           // Runtime persistent state settings are loaded from this file.
 };

=== modified file 'src/location/cmds/status.cpp'
--- src/location/cmds/status.cpp	2016-07-13 14:06:18 +0000
+++ src/location/cmds/status.cpp	2017-03-08 11:32:35 +0000
@@ -19,10 +19,8 @@
 
 #include <location/cmds/status.h>
 #include <location/dbus/stub/service.h>
-#include <location/runtime.h>
-#include <location/util/well_known_bus.h>
-
-#include <core/dbus/asio/executor.h>
+#include <location/glib/runtime.h>
+#include <location/glib/runtime.h>
 
 namespace cli = location::util::cli;
 
@@ -55,33 +53,47 @@
 location::cmds::Status::Status(const std::shared_ptr<Delegate>& delegate)
     : CommandWithFlagsAndAction{cli::Name{"status"}, cli::Usage{"status"}, cli::Description{"queries the status of the daemon"}},
       delegate{delegate},
-      bus{core::dbus::WellKnownBus::system}
+      bus{dbus::Bus::system}
 {
     flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
     action([this](const Context& ctxt)
     {
-        auto rt = location::Runtime::create();
-
-        auto conn = std::make_shared<core::dbus::Bus>(bus);
-
-        conn->install_executor(core::dbus::asio::make_executor(conn, rt->service()));
-
-        auto service = core::dbus::Service::use_service<location::dbus::Service>(conn);
-        auto stub = std::make_shared<location::dbus::stub::Service>(conn, service, service->object_for_path(core::dbus::types::ObjectPath{location::dbus::Service::path()}));
-
-        rt->start();
-
-        Status::delegate->on_summary(Summary
+        location::glib::Runtime runtime;
+
+        location::dbus::stub::Service::create(bus, [this, &ctxt](const location::Result<location::dbus::stub::Service::Ptr>& result)
         {
-            stub->is_online(),
-            stub->state(),
-            stub->does_satellite_based_positioning(),
-            stub->does_report_cell_and_wifi_ids(),
-            stub->visible_space_vehicles()
+            if (result)
+            {
+                auto service = result.value();
+
+                Status::delegate->on_summary(Summary
+                {
+                    service->is_online(),
+                    service->state(),
+                    service->does_satellite_based_positioning(),
+                    service->does_report_cell_and_wifi_ids(),
+                    service->visible_space_vehicles()
+                });
+            }
+            else
+            {
+                try
+                {
+                    result.rethrow();
+                }
+                catch(const std::exception& e)
+                {
+                    ctxt.cout << "Error querying status: " << e.what() << std::endl;
+                }
+                catch(...)
+                {
+                    ctxt.cout << "Error querying status.";
+                }
+            }
+
+            location::glib::Runtime::instance()->stop();
         });
 
-        conn->stop(); rt->stop();
-
-        return EXIT_SUCCESS;
+        return runtime.run();
     });
 }

=== modified file 'src/location/cmds/status.h'
--- src/location/cmds/status.h	2016-08-24 14:12:05 +0000
+++ src/location/cmds/status.h	2017-03-08 11:32:35 +0000
@@ -22,11 +22,10 @@
 
 #include <location/optional.h>
 #include <location/service.h>
+#include <location/dbus/bus.h>
 #include <location/util/cli.h>
 #include <location/visibility.h>
 
-#include <core/dbus/well_known_bus.h>
-
 #include <boost/filesystem.hpp>
 
 #include <iosfwd>
@@ -76,7 +75,7 @@
 
 private:
     std::shared_ptr<Delegate> delegate; // We dispatch summary information to this delegate implementation.
-    core::dbus::WellKnownBus bus;       // The bus we should connect to.
+    dbus::Bus bus;                      // The bus we should connect to.
 };
 }
 }

=== removed file 'src/location/connectivity/cached_radio_cell.cpp'
--- src/location/connectivity/cached_radio_cell.cpp	2016-06-27 06:44:50 +0000
+++ src/location/connectivity/cached_radio_cell.cpp	1970-01-01 00:00:00 +0000
@@ -1,700 +0,0 @@
-/*
- * Copyright © 2012-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: Thomas Voß <[e-mail]>
- */
-
-#include <location/connectivity/cached_radio_cell.h>
-
-#include <core/posix/this_process.h>
-
-namespace
-{
-// We use this for debugging purposes.
-const bool also_apply_cell_change_heuristics_to_gsm_cells =
-    core::posix::this_process::env::get(
-            "LOCATION_CONNECTIVITY_DATA_CELL_FOR_GSM_TOO",
-            "false") == "true";
-
-std::int64_t timeout_in_seconds()
-{
-    auto value = core::posix::this_process::env::get("LOCATION_CONNECTIVITY_DATA_CELL_TIMEOUT", "60");
-    std::stringstream ss(value);
-    std::uint64_t result; ss >> result;
-
-    return result;
-}
-
-// We only activate our heuristics if we are running on problematic hardware
-bool is_running_on_problematic_modem_firmware(const org::Ofono::Manager::Modem& modem)
-{
-    // This is somewhat ambigious and we certainly want to
-    // maintain a database of problematic modem firmware in the
-    // future.
-    auto path = modem.object->path().as_string();
-    return path.find("ril") != std::string::npos;
-}
-}
-
-const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type>& detail::CachedRadioCell::type_lut()
-{
-    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type> lut
-    {
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::gsm(),
-            com::ubuntu::location::connectivity::RadioCell::Type::gsm
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::lte(),
-            com::ubuntu::location::connectivity::RadioCell::Type::lte
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::umts(),
-            com::ubuntu::location::connectivity::RadioCell::Type::umts
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::edge(),
-            com::ubuntu::location::connectivity::RadioCell::Type::gsm
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::hspa(),
-            com::ubuntu::location::connectivity::RadioCell::Type::umts
-        },
-        {std::string(), com::ubuntu::location::connectivity::RadioCell::Type::unknown}
-    };
-
-    return lut;
-}
-
-detail::CachedRadioCell::CellChangeHeuristics::CellChangeHeuristics(
-        boost::asio::io_service& io_service,
-        bool needed)
-    : needed(needed),
-      io_service(io_service),
-      invalidation_timer(io_service),
-      valid(true)
-{
-}
-
-detail::CachedRadioCell::CachedRadioCell(const org::Ofono::Manager::Modem& modem, boost::asio::io_service& io_service)
-    : RadioCell(),      
-      cell_change_heuristics(io_service, is_running_on_problematic_modem_firmware(modem)),
-      roaming(false),
-      radio_type(Type::gsm),
-      modem(modem),
-      detail{}
-{
-    auto status = query_status();
-    radio_type = query_technology();
-
-    connections.network_registration_properties_changed = modem.network_registration.signals.property_changed->connect([this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-    {
-        on_network_registration_property_changed(tuple);
-    });
-
-    if (not is_registered_or_roaming(status))
-        return;
-
-    if (radio_type == com::ubuntu::location::connectivity::RadioCell::Type::unknown)
-        return;
-
-    auto lac = query_lac();
-    auto mcc = query_mcc();
-    auto mnc = query_mnc();
-    auto cell_id = query_cid();
-    auto strength = query_strength();
-
-    switch(radio_type)
-    {
-    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-    {
-        com::ubuntu::location::connectivity::RadioCell::Gsm gsm
-        {
-            com::ubuntu::location::connectivity::RadioCell::Gsm::MCC{mcc},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::MNC{mnc},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::LAC{lac},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::ID{cell_id},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(strength/100.f)
-        };
-        VLOG(1) << gsm;
-        detail.gsm = gsm;
-        break;
-    }
-    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-    {
-        com::ubuntu::location::connectivity::RadioCell::Lte lte
-        {
-            com::ubuntu::location::connectivity::RadioCell::Lte::MCC{mcc},
-            com::ubuntu::location::connectivity::RadioCell::Lte::MNC{mnc},
-            com::ubuntu::location::connectivity::RadioCell::Lte::TAC{lac},
-            com::ubuntu::location::connectivity::RadioCell::Lte::ID{cell_id},
-            com::ubuntu::location::connectivity::RadioCell::Lte::PID{},
-            com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(strength/100.f)
-        };
-        VLOG(1) << lte;
-        detail.lte = lte;
-        break;
-    }
-    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-    {
-        com::ubuntu::location::connectivity::RadioCell::Umts umts
-        {
-            com::ubuntu::location::connectivity::RadioCell::Umts::MCC{mcc},
-            com::ubuntu::location::connectivity::RadioCell::Umts::MNC{mnc},
-            com::ubuntu::location::connectivity::RadioCell::Umts::LAC{lac},
-            com::ubuntu::location::connectivity::RadioCell::Umts::ID{cell_id},
-            com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(strength/100.f)
-        };
-        VLOG(1) << umts;
-        detail.umts = umts;
-        break;
-    }
-    default:
-        break;
-    }
-
-    roaming = status == org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::roaming;
-
-    execute_cell_change_heuristics_if_appropriate();
-}
-
-detail::CachedRadioCell::~CachedRadioCell()
-{
-    modem.network_registration.signals.property_changed->disconnect(connections.network_registration_properties_changed);
-}
-
-const core::Property<bool>& detail::CachedRadioCell::is_roaming() const
-{
-    return roaming;
-}
-
-const core::Property<bool>& detail::CachedRadioCell::is_valid() const
-{
-    return cell_change_heuristics.valid;
-}
-
-const core::Signal<>& detail::CachedRadioCell::changed() const
-{
-    return on_changed;
-}
-
-com::ubuntu::location::connectivity::RadioCell::Type detail::CachedRadioCell::type() const
-{
-    return radio_type;
-}
-
-const com::ubuntu::location::connectivity::RadioCell::Gsm& detail::CachedRadioCell::gsm() const
-{
-    if (radio_type != com::ubuntu::location::connectivity::RadioCell::Type::gsm)
-        throw std::runtime_error("Bad access to unset network type.");
-
-    return detail.gsm;
-}
-
-const com::ubuntu::location::connectivity::RadioCell::Umts& detail::CachedRadioCell::umts() const
-{
-    if (radio_type != RadioCell::Type::umts)
-        throw std::runtime_error("Bad access to unset network type.");
-
-    return detail.umts;
-}
-
-const com::ubuntu::location::connectivity::RadioCell::Lte& detail::CachedRadioCell::lte() const
-{
-    if (radio_type != RadioCell::Type::lte)
-        throw std::runtime_error("Bad access to unset network type.");
-
-    return detail.lte;
-}
-
-void detail::CachedRadioCell::on_network_registration_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-{
-    VLOG(10) << "Property changed on modem " << modem.object->path() << " for network registration: " << std::get<0>(tuple);
-
-    const auto& key = std::get<0>(tuple);
-    const auto& variant = std::get<1>(tuple);
-
-    bool did_cell_identity_change = false;
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::Technology::name())
-    {
-        did_cell_identity_change = true;
-
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType
-                >();
-
-        auto it = type_lut().find(value);
-
-        if (it == type_lut().end())
-        {
-            VLOG(1) << "Unknown technology for connected cell: " << value;
-            return;
-        }
-
-        if (it->second == com::ubuntu::location::connectivity::RadioCell::Type::unknown)
-        {
-            VLOG(1) << "Unknown technology for connected cell: " + value;
-            return;
-        }
-
-        if (radio_type == it->second)
-            return;
-
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            switch(it->second)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.location_area_code = detail.gsm.location_area_code;
-                detail.umts.mobile_network_code = detail.gsm.mobile_network_code;
-                detail.umts.mobile_country_code = detail.gsm.mobile_country_code;
-                detail.umts.strength.reset();
-                detail.umts.id.reset();
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.tracking_area_code = detail.gsm.location_area_code;
-                detail.lte.mobile_network_code = detail.gsm.mobile_network_code;
-                detail.lte.mobile_country_code = detail.gsm.mobile_country_code;
-                detail.lte.strength.reset();
-                detail.lte.id.reset();
-                break;
-            default:
-                break;
-            }
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            switch(it->second)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.location_area_code = detail.umts.location_area_code;
-                detail.gsm.mobile_network_code = detail.umts.mobile_network_code;
-                detail.gsm.mobile_country_code = detail.umts.mobile_country_code;
-                detail.gsm.strength.reset();
-                detail.gsm.id.reset();
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.tracking_area_code = detail.umts.location_area_code;
-                detail.lte.mobile_network_code = detail.umts.mobile_network_code;
-                detail.lte.mobile_country_code = detail.umts.mobile_country_code;
-                detail.lte.strength.reset();
-                detail.lte.id.reset();
-                break;
-            default:
-                break;
-            }
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            switch(it->second)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.location_area_code = detail.lte.tracking_area_code;
-                detail.gsm.mobile_network_code = detail.lte.mobile_network_code;
-                detail.gsm.mobile_country_code = detail.lte.mobile_country_code;
-                detail.gsm.strength.reset();
-                detail.gsm.id.reset();
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.location_area_code = detail.lte.tracking_area_code;
-                detail.umts.mobile_network_code = detail.lte.mobile_network_code;
-                detail.umts.mobile_country_code = detail.lte.mobile_country_code;
-                detail.umts.strength.reset();
-                detail.umts.id.reset();
-                break;
-            default:
-                break;
-            }
-        default:
-            // We take the default path here, specifically for cases where
-            // we started out with Technology::unknown.
-            break;
-        };
-
-        radio_type = it->second;
-
-        if (cell_change_heuristics.valid.get())
-            on_changed();
-    }
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::CellId::name())
-    {
-        did_cell_identity_change = true;
-
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::CellId::ValueType
-                >();
-
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.id.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.id.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.id.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
-        };
-
-        if (cell_change_heuristics.valid.get())
-            on_changed();
-    }
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::name())
-    {
-        did_cell_identity_change = true;
-
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::ValueType
-                >();
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.location_area_code.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.location_area_code.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.tracking_area_code.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
-        };
-
-        if (cell_change_heuristics.valid.get())
-            on_changed();
-    }
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::name())
-    {
-        did_cell_identity_change = true;
-
-        std::stringstream ss
-        {
-            variant.as<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::ValueType
-            >()
-        };
-        int value{-1}; ss >> value;
-
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.mobile_country_code.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.mobile_country_code.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.mobile_country_code.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
-        };
-
-        if (cell_change_heuristics.valid.get())
-            on_changed();
-    }
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::name())
-    {
-        did_cell_identity_change = true;
-
-        std::stringstream ss
-        {
-            variant.as<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::ValueType
-            >()
-        };
-        int value{-1}; ss >> value;
-
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.mobile_network_code.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.mobile_network_code.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.mobile_network_code.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
-        };
-
-        if (cell_change_heuristics.valid.get())
-            on_changed();
-    }
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::Strength::name())
-    {
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Strength::ValueType
-                >();
-
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.strength
-                    = com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(value/100.f);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.strength
-                    = com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(value/100.f);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.strength
-                    = com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(value/100.f);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
-        };
-
-        if (cell_change_heuristics.valid.get())
-            on_changed();
-    }
-
-    if (key == org::Ofono::Manager::Modem::NetworkRegistration::Status::name())
-    {
-        roaming =
-                variant.as<org::Ofono::Manager::Modem::NetworkRegistration::Status::ValueType>() ==
-                org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming;
-    }
-
-    if (did_cell_identity_change)
-        execute_cell_change_heuristics_if_appropriate();
-}
-
-void detail::CachedRadioCell::execute_cell_change_heuristics_if_appropriate()
-{
-    // Heuristics to ensure that
-    // whenever the cell identity changes, we start a timer and invalidate the
-    // cell to account for situations where the underlying modem firmware does not
-    // report cell changes when on a 3G data connection.
-    if (cell_change_heuristics.needed && // Only carry out this step if it is actually required
-        (radio_type == com::ubuntu::location::connectivity::RadioCell::Type::umts ||
-         also_apply_cell_change_heuristics_to_gsm_cells)) // and if it's a 3G cell.
-    {
-        static const boost::posix_time::seconds timeout{timeout_in_seconds()};
-
-        std::lock_guard<std::mutex> lg(cell_change_heuristics.guard);
-
-        cell_change_heuristics.invalidation_timer.expires_from_now(timeout);
-        cell_change_heuristics.invalidation_timer.async_wait([this](boost::system::error_code ec)
-        {
-            if (not ec)
-                cell_change_heuristics.valid = false;
-        });
-
-        cell_change_heuristics.valid = is_cell_details_valid();
-    }
-}
-
-// Queries the status from the Ofono NetworkRegistration.
-org::Ofono::Manager::Modem::NetworkRegistration::Status::Value detail::CachedRadioCell::query_status()
-{
-    auto status =
-            modem.network_registration.get
-            <
-                org::Ofono::Manager::Modem::NetworkRegistration::Status
-            >();
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::unregistered)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unregistered;
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::registered)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::registered;
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::searching)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::searching;
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::denied)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::denied;
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::unknown)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unknown;
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::unregistered)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unregistered;
-
-    if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming)
-        return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::roaming;
-
-    return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unknown;
-}
-
-// Queries the technology from the Ofono NetworkRegistration.
-com::ubuntu::location::connectivity::RadioCell::Type detail::CachedRadioCell::query_technology()
-{
-    auto technology =
-            modem.network_registration.get<
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology
-            >();
-
-    auto it = type_lut().find(technology);
-
-    if (it == type_lut().end())
-        return com::ubuntu::location::connectivity::RadioCell::Type::unknown;
-
-    return it->second;
-}
-
-// Queries the cell id from the Ofono NetworkRegistration.
-int detail::CachedRadioCell::query_cid()
-{
-    return modem.network_registration.get
-    <
-        org::Ofono::Manager::Modem::NetworkRegistration::CellId
-    >();
-}
-
-// Queries the location area code from the Ofono NetworkRegistration.
-std::uint16_t detail::CachedRadioCell::query_lac()
-{
-    return modem.network_registration.get
-    <
-        org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode
-    >();
-}
-
-// Queries the mobile network code from the Ofono NetworkRegistration.
-int detail::CachedRadioCell::query_mnc()
-{
-    std::stringstream ssmnc
-    {
-        modem.network_registration.get
-        <
-            org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode
-        >()
-    };
-    int mnc{0}; ssmnc >> mnc;
-    return mnc;
-}
-
-// Queries the mobile country code from the Ofono NetworkRegistration.
-int detail::CachedRadioCell::query_mcc()
-{
-    std::stringstream ssmcc
-    {
-        modem.network_registration.get
-        <
-            org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode
-        >()
-    };
-    int mcc{0}; ssmcc >> mcc;
-    return mcc;
-}
-
-// Queries the signal strength from the Ofono NetworkRegistration.
-std::int8_t detail::CachedRadioCell::query_strength()
-{
-    return modem.network_registration.get
-    <
-        org::Ofono::Manager::Modem::NetworkRegistration::Strength
-    >();
-}
-
-// Returns true iff status is either roaming or registered.
-bool detail::CachedRadioCell::is_registered_or_roaming(org::Ofono::Manager::Modem::NetworkRegistration::Status::Value status)
-{
-    return status == org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::registered ||
-           status == org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::roaming;
-}
-
-// Returns true iff all the parts of the cell are populated with valid values.
-bool detail::CachedRadioCell::is_cell_details_valid()
-{
-    switch(radio_type)
-    {
-    case com::ubuntu::location::connectivity::RadioCell::Type::unknown:
-        return false;
-    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-        return is_gsm_valid();
-    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-        return is_umts_valid();
-    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-        return is_lte_valid();
-    }
-
-    return false;
-}
-
-// Retuns true iff the GSM cell details are valid.
-bool detail::CachedRadioCell::is_gsm_valid()
-{
-   return gsm().mobile_country_code.is_valid() &&
-          gsm().mobile_network_code.is_valid() &&
-          gsm().location_area_code.is_valid() &&
-          gsm().id.is_valid() &&
-          gsm().strength.is_valid();
-}
-
-// Returns true iff the Umts cell details are valid.
-bool detail::CachedRadioCell::is_umts_valid()
-{
-    return umts().mobile_country_code.is_valid() &&
-           umts().mobile_network_code.is_valid() &&
-           umts().location_area_code.is_valid() &&
-           umts().id.is_valid() &&
-           umts().strength.is_valid();
-}
-
-// Returns true iff the Lte cell details are valid.
-bool detail::CachedRadioCell::is_lte_valid()
-{
-    return lte().mobile_country_code.is_valid() &&
-           lte().mobile_network_code.is_valid() &&
-           lte().tracking_area_code.is_valid() &&
-           lte().id.is_valid() &&
-           lte().physical_id.is_valid() &&
-           lte().strength.is_valid();
-}
-
-detail::CachedRadioCell::Detail::Detail() : none(detail::CachedRadioCell::None{})
-{
-}
-
-detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm) : gsm(gsm)
-{
-}
-
-detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts) : umts(umts)
-{
-}
-
-detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte) : lte(lte)
-{
-}

=== removed file 'src/location/connectivity/cached_radio_cell.h'
--- src/location/connectivity/cached_radio_cell.h	2016-06-26 21:17:03 +0000
+++ src/location/connectivity/cached_radio_cell.h	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-/*
- * Copyright © 2012-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: Thomas Voß <[e-mail]>
- */
-#ifndef CACHED_RADIO_CELL_H_
-#define CACHED_RADIO_CELL_H_
-
-#include <location/connectivity/radio_cell.h>
-
-#include "ofono.h"
-
-#include <boost/asio.hpp>
-
-namespace detail
-{
-
-class CachedRadioCell : public com::ubuntu::location::connectivity::RadioCell
-{
-public:
-    // To save some typing.
-    typedef std::shared_ptr<CachedRadioCell> Ptr;
-
-    // Translates ofono technologies to radio-cell types.
-    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type>& type_lut();
-
-    // Creates an instance of a cached radio cell, deduced from the network registration
-    // associated to the modem.
-    CachedRadioCell(const org::Ofono::Manager::Modem& modem, boost::asio::io_service& io_service);
-
-    // Frees all resources and cuts all event connections.
-    ~CachedRadioCell();
-
-    // Returns true iff the network registration is roaming.
-    const core::Property<bool>& is_roaming() const;
-
-    // Returns true iff the instance represents a valid cell.
-    const core::Property<bool>& is_valid() const;
-
-    // Emitted when the cell details change.
-    const core::Signal<>& changed() const override;
-
-    // Returns the type of the radio cell.
-    com::ubuntu::location::connectivity::RadioCell::Type type() const override;
-
-    // Returns GSM-specific details or throws std::runtime_error if this is not a GSM radiocell.
-    const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm() const override;
-
-    // Returns UMTS-specific details or throws std::runtime_error if this is not a UMTS radiocell.
-    const com::ubuntu::location::connectivity::RadioCell::Umts& umts() const override;
-
-    // Returns LTE-specific details or throws std::runtime_error if this is not an LTE radiocell.
-    const com::ubuntu::location::connectivity::RadioCell::Lte& lte() const override;
-
-    // Invoked whenever a property specific to a network registration changes remotely.
-    void on_network_registration_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple);
-
-private:
-    // All members required for implementing the
-    // cell change heuristics go here.
-    struct CellChangeHeuristics
-    {
-        CellChangeHeuristics(boost::asio::io_service& io_service,
-                             bool needed);
-        // True if the heuristic is needed
-        const bool needed;
-        // The io_service for setting up timeouts.
-        boost::asio::io_service& io_service;
-        // We might experience a race on construction, if a change
-        // of a cell attribute arrives prior to setting up the timeout.
-        std::mutex guard;
-        // Our timer for invalidating cells.
-        boost::asio::deadline_timer invalidation_timer;
-        // Property to indicate whether the current cell is
-        // still valid according to the cell change heuristics.
-        core::Property<bool> valid;
-    } cell_change_heuristics;       
-    // Executes the cell change heuristics if precondition is met.
-    void execute_cell_change_heuristics_if_appropriate();
-
-    // Queries the status from the Ofono NetworkRegistration.
-    org::Ofono::Manager::Modem::NetworkRegistration::Status::Value query_status();
-    // Queries the technology from the Ofono NetworkRegistration.
-    Type query_technology();
-    // Queries the cell id from the Ofono NetworkRegistration.
-    int query_cid();
-    // Queries the location area code from the Ofono NetworkRegistration.
-    std::uint16_t query_lac();
-    // Queries the mobile network code from the Ofono NetworkRegistration.
-    int query_mnc();
-    // Queries the mobile country code from the Ofono NetworkRegistration.
-    int query_mcc();
-    // Queries the signal strength from the Ofono NetworkRegistration.
-    std::int8_t query_strength();
-    // Returns true iff status is either roaming or registered.
-    bool is_registered_or_roaming(org::Ofono::Manager::Modem::NetworkRegistration::Status::Value status);
-    // Returns true iff all the parts of the cell are populated with valid values.
-    bool is_cell_details_valid();
-    // Retuns true iff the GSM cell details are valid.
-    bool is_gsm_valid();
-    // Returns true iff the Umts cell details are valid.
-    bool is_umts_valid();
-    // Returns true iff the Lte cell details are valid.
-    bool is_lte_valid();
-
-    core::Property<bool> roaming;
-    core::Signal<> on_changed;
-    Type radio_type;
-    org::Ofono::Manager::Modem modem;
-
-    // Encapsulates all event connections that have to be cut on destruction.
-    struct
-    {
-        core::dbus::Signal
-        <
-            org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged,
-            org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged::ArgumentType
-        >::SubscriptionToken network_registration_properties_changed;
-    } connections;
-
-    // Marks the unset type in a variant.
-    struct None {};
-
-    // Our custom variant handling the different known cell identity details.
-    union Detail
-    {
-        // Constructs an empty instance
-        Detail();
-        // Constructs an instance holding details about a gsm cell.
-        Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm);
-        // Constructs an instance holding details about a umtscell.
-        Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts);
-        // Constructs an instance holding details about an lte cell.
-        Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte);
-
-        // Our union members.
-        None none;
-        Gsm gsm;
-        Umts umts;
-        Lte lte;
-    } detail;
-};
-}
-
-#endif // CACHED_RADIO_CELL_H_

=== removed file 'src/location/connectivity/cached_wireless_network.cpp'
--- src/location/connectivity/cached_wireless_network.cpp	2016-06-26 21:17:03 +0000
+++ src/location/connectivity/cached_wireless_network.cpp	1970-01-01 00:00:00 +0000
@@ -1,226 +0,0 @@
-/*
- * Copyright © 2012-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: Thomas Voß <[e-mail]>
- */
-
-#include <location/connectivity/cached_wireless_network.h>
-
-#include <fstream>
-#include <sstream>
-#include <string>
-
-namespace connectivity = com::ubuntu::location::connectivity;
-
-namespace
-{
-std::string utf8_ssid_to_string(const org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType& ssid)
-{
-    return std::string(ssid.begin(), ssid.end());
-}
-
-com::ubuntu::location::connectivity::WirelessNetwork::Mode
-wifi_mode_from_ap_mode(org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType value)
-{
-    com::ubuntu::location::connectivity::WirelessNetwork::Mode mode
-    {
-        com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown
-    };
-
-    switch (value)
-    {
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::unknown:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown;
-        break;
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::adhoc:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::adhoc;
-        break;
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::infra:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::infrastructure;
-        break;
-    }
-
-    return mode;
-}
-
-// boot_time returns the time since the epoch when the system booted.
-std::chrono::system_clock::time_point boot_time()
-{
-    std::ifstream in{"/proc/stat"};
-    std::string line;
-
-    while (std::getline(in, line))
-    {
-        if (line.empty())
-            continue;
-
-        std::stringstream ss{line};
-        std::string name; ss >> name;
-
-        if (name != "btime")
-            continue;
-
-        std::uint64_t ts; ss >> ts;
-        return std::chrono::system_clock::time_point{std::chrono::seconds{ts}};
-    }
-
-    // Fallback to the best estimate we can give.
-    return std::chrono::system_clock::now();
-}
-
-// NetworkManager reports AP LastSeen timestamps in seconds since boot. We map that back to the epoch
-// to keep dependent software working.
-std::chrono::system_clock::time_point translate_time_stamp(std::uint64_t ts)
-{
-    static const auto ts_when_booted = boot_time();
-    return ts_when_booted + std::chrono::seconds{ts};
-}
-}
-
-const core::Property<std::chrono::system_clock::time_point>& detail::CachedWirelessNetwork::last_seen() const
-{
-    return last_seen_;
-}
-
-const core::Property<std::string>& detail::CachedWirelessNetwork::bssid() const
-{
-    return bssid_;
-}
-
-const core::Property<std::string>& detail::CachedWirelessNetwork::ssid() const
-{
-    return ssid_;
-}
-
-const core::Property<connectivity::WirelessNetwork::Mode>& detail::CachedWirelessNetwork::mode() const
-{
-    return mode_;
-}
-
-const core::Property<connectivity::WirelessNetwork::Frequency>& detail::CachedWirelessNetwork::frequency() const
-{
-    return frequency_;
-}
-
-const core::Property<connectivity::WirelessNetwork::SignalStrength>& detail::CachedWirelessNetwork::signal_strength() const
-{
-    return signal_strength_;
-}
-
-detail::CachedWirelessNetwork::CachedWirelessNetwork(
-        const org::freedesktop::NetworkManager::Device& device,
-        const org::freedesktop::NetworkManager::AccessPoint& ap)
-    : device_(device),
-      access_point_(ap),
-      connections
-      {
-          access_point_.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
-          {
-              on_access_point_properties_changed(dict);
-          })
-      }
-{
-    last_seen_ = translate_time_stamp(access_point_.last_seen->get());
-
-    bssid_ = access_point_.hw_address->get();
-    ssid_ = utf8_ssid_to_string(access_point_.ssid->get());
-    mode_ = wifi_mode_from_ap_mode(access_point_.mode->get());
-    frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
-    {
-        static_cast<int>(access_point_.frequency->get())
-    };
-    signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
-    {
-        static_cast<int>(access_point_.strength->get())
-    };
-}
-
-detail::CachedWirelessNetwork::~CachedWirelessNetwork()
-{
-    access_point_.properties_changed->disconnect(connections.ap_properties_changed);
-}
-
-void detail::CachedWirelessNetwork::on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict)
-{
-    // We route by string
-    static const std::unordered_map<std::string, std::function<void(CachedWirelessNetwork&, const core::dbus::types::Variant&)> > lut
-    {
-        {
-            org::freedesktop::NetworkManager::AccessPoint::HwAddress::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.bssid_ = value.as<org::freedesktop::NetworkManager::AccessPoint::HwAddress::ValueType>();
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Ssid::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.ssid_ = utf8_ssid_to_string(value.as<org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType>());
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Strength::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
-                {
-                    value.as<org::freedesktop::NetworkManager::AccessPoint::Strength::ValueType>()
-                };
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Frequency::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
-                {
-                    static_cast<int>(value.as<org::freedesktop::NetworkManager::AccessPoint::Frequency::ValueType>())
-                };
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Mode::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.mode_ = wifi_mode_from_ap_mode(value.as<org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType>());
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::LastSeen::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.last_seen_ = translate_time_stamp(
-                    value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>());
-            }
-        }
-    };
-
-    for (const auto& pair : dict)
-    {
-        VLOG(1) << "Properties on access point " << ssid_.get() << " changed: \n"
-                << "  " << pair.first;
-
-        // We do not treat failing property updates as fatal but instead just
-        // log the issue for later analysis.
-        try
-        {
-            if (lut.count(pair.first) > 0) lut.at(pair.first)(*this, pair.second);
-        } catch (...)
-        {
-            VLOG(1) << "Exception while updating state for property change: " << pair.first;
-        }
-    }
-}

=== removed file 'src/location/connectivity/cached_wireless_network.h'
--- src/location/connectivity/cached_wireless_network.h	2016-06-26 21:17:03 +0000
+++ src/location/connectivity/cached_wireless_network.h	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright © 2012-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: Thomas Voß <[e-mail]>
- */
-#ifndef CACHED_WIRELESS_NETWORK_H_
-#define CACHED_WIRELESS_NETWORK_H_
-
-#include <location/connectivity/wireless_network.h>
-
-#include <location/logging.h>
-
-#include "nm.h"
-
-namespace detail
-{
-
-// Implements the WirelessNetwork interface relying on a remote NetworkManager instance,
-// caching all of the interesting properties.
-struct CachedWirelessNetwork : public com::ubuntu::location::connectivity::WirelessNetwork
-{
-    // Just to save some typing.
-    typedef std::shared_ptr<CachedWirelessNetwork> Ptr;
-
-    // Constructs a new instance associated with the ap and the (remote) device
-    // it belongs to. Please note that the caching nature of the class ensures that
-    // ap and device stubs are kept alive.
-    CachedWirelessNetwork(
-            const org::freedesktop::NetworkManager::Device& device,
-            const org::freedesktop::NetworkManager::AccessPoint& ap);
-
-    ~CachedWirelessNetwork();
-
-    // Timestamp when the network became visible.
-    const core::Property<std::chrono::system_clock::time_point>& last_seen() const override;
-
-    // Returns the BSSID of the network
-    const core::Property<std::string>& bssid() const override;
-
-    // Returns the SSID of the network.
-    const core::Property<std::string>& ssid() const override;
-
-    // Returns the mode of the network.
-    const core::Property<Mode>& mode() const override;
-
-    // Returns the frequency that the network/AP operates upon.
-    const core::Property<Frequency>& frequency() const override;
-
-    // Returns the signal quality of the network/AP in percent.
-    const core::Property<SignalStrength>& signal_strength() const override;
-
-    // Called whenever a property of an access point changes.
-    void on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict);
-
-    // The cached network manager device associated to the access point.
-    org::freedesktop::NetworkManager::Device device_;
-    // The actual access point stub.
-    org::freedesktop::NetworkManager::AccessPoint access_point_;
-
-    // Encapsulates all event connections that have to be cut on destruction.
-    struct
-    {
-        core::dbus::Signal
-        <
-            org::freedesktop::NetworkManager::AccessPoint::PropertiesChanged,
-            org::freedesktop::NetworkManager::AccessPoint::PropertiesChanged::ArgumentType
-        >::SubscriptionToken ap_properties_changed;
-    } connections;
-
-    core::Property<std::chrono::system_clock::time_point> last_seen_;
-    core::Property<std::string> bssid_;
-    core::Property<std::string> ssid_;
-    core::Property<WirelessNetwork::Mode> mode_;
-    core::Property<WirelessNetwork::Frequency> frequency_;
-    core::Property<WirelessNetwork::SignalStrength> signal_strength_;
-};
-}
-
-#endif // CACHED_WIRELESS_NETWORK_H_

=== removed file 'src/location/connectivity/nm.h'
--- src/location/connectivity/nm.h	2016-08-14 19:36:05 +0000
+++ src/location/connectivity/nm.h	1970-01-01 00:00:00 +0000
@@ -1,694 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_CONNECTIVITY_NM_H
-#define LOCATION_CONNECTIVITY_NM_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-
-namespace org
-{
-namespace freedesktop
-{
-struct NetworkManager
-{
-    typedef std::shared_ptr<NetworkManager> Ptr;
-
-    struct AccessPoint
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.NetworkManager.AccessPoint"};
-            return s;
-        }
-
-        struct Frequency
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"Frequency"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct LastSeen
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"LastSeen"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct Mode
-        {
-            enum Value
-            {
-                unknown = 0,
-                adhoc = 1,
-                infra = 2,
-                ap = 3
-            };
-
-            static const std::string& name()
-            {
-                static const std::string s{"Mode"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct HwAddress
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"HwAddress"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-            typedef std::string ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct Ssid
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"Ssid"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-            typedef std::vector<std::int8_t> ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct Strength
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"Strength"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-            typedef std::int8_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct PropertiesChanged
-        {
-            inline static const std::string& name()
-            {
-                static const std::string s{"PropertiesChanged"};
-                return s;
-            }
-
-            typedef AccessPoint Interface;
-
-            typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-        };
-
-        AccessPoint(const std::shared_ptr<core::dbus::Object>& object)
-            : object(object),
-              frequency(object->get_property<Frequency>()),
-              last_seen(object->get_property<LastSeen>()),
-              mode(object->get_property<Mode>()),
-              hw_address(object->get_property<HwAddress>()),
-              ssid(object->get_property<Ssid>()),
-              strength(object->get_property<Strength>()),
-              properties_changed(object->get_signal<PropertiesChanged>())
-        {
-        }
-
-        std::shared_ptr<core::dbus::Object> object;
-        std::shared_ptr<core::dbus::Property<Frequency>> frequency;
-        std::shared_ptr<core::dbus::Property<LastSeen>> last_seen;
-        std::shared_ptr<core::dbus::Property<Mode>> mode;
-        std::shared_ptr<core::dbus::Property<HwAddress>> hw_address;
-        std::shared_ptr<core::dbus::Property<Ssid>> ssid;
-        std::shared_ptr<core::dbus::Property<Strength>> strength;
-        std::shared_ptr<core::dbus::Signal<PropertiesChanged, PropertiesChanged::ArgumentType>> properties_changed;
-    };
-
-    struct Device
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.NetworkManager.Device"};
-            return s;
-        }
-
-        enum class Type
-        {
-            unknown = 0,
-            ethernet = 1,
-            wifi = 2,
-            unused_1 = 3,
-            unused_2 = 4,
-            bluetooth = 5,
-            olpc_mesh = 6,
-            wimax = 7,
-            modem = 8,
-            infiniband = 9,
-            bond = 10,
-            vlan = 11,
-            adsl = 12,
-            bridge = 13
-        };
-
-        struct Wireless
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"org.freedesktop.NetworkManager.Device.Wireless"};
-                return s;
-            }
-
-            struct GetAccessPoints
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"GetAccessPoints"};
-                    return s;
-                }
-
-                typedef Wireless Interface;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{1};
-                }
-            };
-
-            struct RequestScan
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"RequestScan"};
-                    return s;
-                }
-
-                typedef Wireless Interface;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{1};
-                }
-            };
-
-            struct Signals
-            {
-                struct ScanDone
-                {
-                    inline static std::string name()
-                    {
-                        return "ScanDone";
-                    }
-
-                    typedef Wireless Interface;
-                    typedef void ArgumentType;
-                };
-
-                struct AccessPointAdded
-                {
-                    inline static std::string name()
-                    {
-                        return "AccessPointAdded";
-                    }
-
-                    typedef Wireless Interface;
-
-                    typedef core::dbus::types::ObjectPath ArgumentType;
-                };
-
-                struct AccessPointRemoved
-                {
-                    inline static std::string name()
-                    {
-                        return "AccessPointRemoved";
-                    }
-
-                    typedef Wireless Interface;
-
-                    typedef core::dbus::types::ObjectPath ArgumentType;
-                };
-            };
-        };
-
-        struct DeviceType
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"DeviceType"};
-                return s;
-            }
-
-            typedef Device Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        Device(const std::shared_ptr<core::dbus::Service>& service,
-               const std::shared_ptr<core::dbus::Object>& object)
-            : service(service),
-              object(object),
-              device_type(object->get_property<DeviceType>()),
-              signals
-              {
-                  object->get_signal<Wireless::Signals::ScanDone>(),
-                  object->get_signal<Wireless::Signals::AccessPointAdded>(),
-                  object->get_signal<Wireless::Signals::AccessPointRemoved>()
-              }
-        {
-        }
-
-        Type type() const
-        {
-            return static_cast<Type>(device_type->get());
-        }
-
-        void for_each_access_point(const std::function<void(const core::dbus::types::ObjectPath&)>& f) const
-        {
-            typedef std::vector<core::dbus::types::ObjectPath> ResultType;
-            auto result = object->transact_method<Wireless::GetAccessPoints, ResultType>();
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            for (const auto& path : result.value())
-                f(path);
-        }
-
-        std::vector<AccessPoint> get_access_points() const
-        {
-            typedef std::vector<core::dbus::types::ObjectPath> ResultType;
-            auto result = object->invoke_method_synchronously<Wireless::GetAccessPoints, ResultType>();
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            std::vector<AccessPoint> aps;
-
-            for (const auto& path : result.value())
-                aps.push_back(AccessPoint(service->object_for_path(path)));
-
-            return aps;
-        }
-
-        void request_scan() const
-        {
-            static const std::map<std::string, core::dbus::types::Variant> dictionary;
-            auto result = object->invoke_method_asynchronously<Wireless::RequestScan, void>(dictionary);
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-        std::shared_ptr<core::dbus::Property<DeviceType>> device_type;
-        struct
-        {
-            core::dbus::Signal<Wireless::Signals::ScanDone, Wireless::Signals::ScanDone::ArgumentType>::Ptr scan_done;
-            core::dbus::Signal<Wireless::Signals::AccessPointAdded, Wireless::Signals::AccessPointAdded::ArgumentType>::Ptr ap_added;
-            core::dbus::Signal<Wireless::Signals::AccessPointRemoved, Wireless::Signals::AccessPointRemoved::ArgumentType>::Ptr ap_removed;
-        } signals;
-    };
-
-    struct ActiveConnection
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.NetworkManager.Connection.Active"};
-            return s;
-        }
-
-        struct Properties
-        {
-            struct Devices
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Devices"};
-                    return s;
-                }
-
-                typedef ActiveConnection Interface;
-                typedef std::vector<core::dbus::types::ObjectPath> ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-        };
-
-        ActiveConnection(const std::shared_ptr<core::dbus::Service>& service,
-                         const std::shared_ptr<core::dbus::Object>& object)
-            : service{service},
-              object{object},
-              properties
-              {
-                  object->get_property<Properties::Devices>()
-              }
-        {
-        }
-
-        void enumerate_devices(const std::function<void(const core::dbus::types::ObjectPath& path)>& functor)
-        {
-            auto device_paths = properties.devices->get();
-
-            for (const auto& device_path : device_paths)
-                functor(device_path);
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-        struct
-        {
-            std::shared_ptr<core::dbus::Property<Properties::Devices> > devices;
-        } properties;
-    };
-
-    static const std::string& name()
-    {
-        static const std::string s{"org.freedesktop.NetworkManager"};
-        return s;
-    }
-
-    struct GetDevices
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"GetDevices"};
-            return s;
-        }
-
-        typedef NetworkManager Interface;
-
-        static std::chrono::milliseconds default_timeout()
-        {
-            return std::chrono::seconds{1};
-        }
-    };
-
-    struct Properties
-    {
-        struct Connectivity
-        {
-            enum Values
-            {
-                unknown = 0,
-                none = 1,
-                portal = 2,
-                limited = 3,
-                full = 4
-            };
-
-            static const std::string& name()
-            {
-                static const std::string s{"Connectivity"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct State
-        {
-            enum Values
-            {
-                unknown = 0,
-                asleep = 10,
-                disconnected = 20,
-                disconnecting = 30,
-                connecting = 40,
-                connected_local = 50,
-                connected_site = 60,
-                connected_global = 70
-            };
-
-            static const std::string& name()
-            {
-                static const std::string s{"State"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct PrimaryConnection
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"PrimaryConnection"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef core::dbus::types::ObjectPath ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct WirelessEnabled
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"WirelessEnabled"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct WirelessHardwareEnabled
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"WirelessHardwareEnabled"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct WwanEnabled
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"WwanEnabled"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-
-        struct WwanHardwareEnabled
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"WwanHardwareEnabled"};
-                return s;
-            }
-
-            typedef NetworkManager Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-    };
-
-    struct Signals
-    {
-        struct DeviceAdded
-        {
-            inline static std::string name()
-            {
-                return "DeviceAdded";
-            }
-
-            typedef NetworkManager Interface;
-
-            typedef core::dbus::types::ObjectPath ArgumentType;
-        };
-
-        struct DeviceRemoved
-        {
-            inline static std::string name()
-            {
-                return "DeviceRemoved";
-            }
-
-            typedef NetworkManager Interface;
-
-            typedef core::dbus::types::ObjectPath ArgumentType;
-        };
-
-        struct PropertiesChanged
-        {
-            inline static std::string name()
-            {
-                return "PropertiesChanged";
-            }
-
-            typedef NetworkManager Interface;
-
-            typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-        };
-
-        struct StateChanged
-        {
-            inline static std::string name()
-            {
-                return "StateChanged";
-            }
-
-            typedef NetworkManager Interface;
-
-            typedef std::uint32_t ArgumentType;
-        };
-    };
-
-    NetworkManager(const core::dbus::Bus::Ptr& bus)
-        : service(core::dbus::Service::use_service<NetworkManager>(bus)),
-          object(service->object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/NetworkManager"))),
-          properties
-          {
-              object->get_property<Properties::Connectivity>(),
-              object->get_property<Properties::PrimaryConnection>(),
-              object->get_property<Properties::State>(),
-              object->get_property<Properties::WirelessEnabled>(),
-              object->get_property<Properties::WirelessHardwareEnabled>(),
-              object->get_property<Properties::WwanEnabled>(),
-              object->get_property<Properties::WwanHardwareEnabled>()
-          },
-          signals
-          {
-              object->get_signal<Signals::DeviceAdded>(),
-              object->get_signal<Signals::DeviceRemoved>(),
-              object->get_signal<Signals::PropertiesChanged>(),
-              object->get_signal<Signals::StateChanged>()
-          }
-    {
-    }
-
-    void for_each_device(const std::function<void(const core::dbus::types::ObjectPath&)>& f)
-    {
-        auto result =
-                object->transact_method<
-                    NetworkManager::GetDevices,
-                    std::vector<core::dbus::types::ObjectPath>
-                >();
-
-        if (result.is_error())
-            throw std::runtime_error(result.error().print());
-
-        for (const auto& path : result.value())
-            f(path);
-    }
-
-    Device device_for_path(const core::dbus::types::ObjectPath& path)
-    {
-        return Device(service, service->object_for_path(path));
-    }
-
-    std::vector<Device> get_devices()
-    {
-        auto result =
-                object->invoke_method_synchronously<
-                    NetworkManager::GetDevices,
-                    std::vector<core::dbus::types::ObjectPath>>();
-
-        if (result.is_error())
-            throw std::runtime_error(result.error().print());
-
-        std::vector<Device> devices;
-        for (const auto& path : result.value())
-        {
-            devices.emplace_back(
-                        Device(
-                            service,
-                            service->object_for_path(path)));
-        }
-
-        return devices;
-    }
-
-    std::shared_ptr<core::dbus::Service> service;
-    std::shared_ptr<core::dbus::Object> object;
-
-    struct
-    {
-        std::shared_ptr<core::dbus::Property<Properties::Connectivity> > connectivity;
-        std::shared_ptr<core::dbus::Property<Properties::PrimaryConnection> > primary_connection;
-        std::shared_ptr<core::dbus::Property<Properties::State> > state;
-        std::shared_ptr<core::dbus::Property<Properties::WirelessEnabled> > is_wifi_enabled;
-        std::shared_ptr<core::dbus::Property<Properties::WirelessHardwareEnabled> > is_wifi_hardware_enabled;
-        std::shared_ptr<core::dbus::Property<Properties::WwanEnabled> > is_wwan_enabled;
-        std::shared_ptr<core::dbus::Property<Properties::WwanHardwareEnabled> > is_wwan_hardware_enabled;
-    } properties;
-    struct
-    {
-        core::dbus::Signal<Signals::DeviceAdded, Signals::DeviceAdded::ArgumentType>::Ptr device_added;
-        core::dbus::Signal<Signals::DeviceRemoved, Signals::DeviceRemoved::ArgumentType>::Ptr device_removed;
-        core::dbus::Signal<Signals::PropertiesChanged, Signals::PropertiesChanged::ArgumentType>::Ptr properties_changed;
-        core::dbus::Signal<Signals::StateChanged, Signals::StateChanged::ArgumentType>::Ptr state_changed;
-    } signals;
-};
-}
-}
-
-#endif // LOCATION_CONNECTIVITY_NM_H

=== removed file 'src/location/connectivity/ofono.h'
--- src/location/connectivity/ofono.h	2016-06-27 06:44:50 +0000
+++ src/location/connectivity/ofono.h	1970-01-01 00:00:00 +0000
@@ -1,711 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_CONNECTIVITY_OFONO_H
-#define LOCATION_CONNECTIVITY_OFONO_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/variant.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-
-#include <location/logging.h>
-
-namespace org
-{
-struct Ofono
-{
-static const std::string& name()
-{
-    static const std::string s{"org.ofono"};
-    return s;
-}
-struct Manager
-{
-    typedef std::shared_ptr<Manager> Ptr;
-
-    static const std::string& name()
-    {
-        static const std::string s{"org.ofono.Manager"};
-        return s;
-    }
-
-    struct GetModems
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"GetModems"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::vector<
-            core::dbus::types::Struct<
-                core::dbus::types::ObjectPath
-            >
-        > ResultType;
-
-        static std::chrono::milliseconds default_timeout()
-        {
-            return std::chrono::seconds{1};
-        }
-    };
-
-    struct ModemAdded
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemAdded"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::tuple<core::dbus::types::ObjectPath, std::map<std::string, std::string>> ArgumentType;
-    };
-
-    struct ModemRemoved
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemRemoved"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef core::dbus::types::ObjectPath ArgumentType;
-    };
-
-    struct Modem
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.ofono.Modem"};
-            return s;
-        }
-
-        struct GetProperties
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"GetProperties"};
-                return s;
-            }
-
-            typedef Modem Interface;
-            typedef std::map<std::string, core::dbus::types::Variant> ValueType;
-
-            static std::chrono::milliseconds default_timeout()
-            {
-                return std::chrono::seconds{1};
-            }
-        };
-
-        struct PropertyChanged
-        {
-            inline static std::string name()
-            {
-                return "PropertyChanged";
-            }
-
-            typedef Modem Interface;
-
-            typedef std::tuple<std::string, core::dbus::types::Variant> ArgumentType;
-        };
-
-        struct Properties
-        {
-            struct Powered
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Powered"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef bool ValueType;
-                static const bool readable = true;
-                static const bool writable = true;
-            };
-
-            struct Online
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Online"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef bool ValueType;
-                static const bool readable = true;
-                static const bool writable = true;
-            };
-
-            struct Lockdown
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Lockdown"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef bool ValueType;
-                static const bool readable = true;
-                static const bool writable = true;
-            };
-
-            struct Name
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Name"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Manufacturer
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Manufacturer"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Model
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Model"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Revision
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Revision"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Serial
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Serial"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Features
-            {
-                static constexpr const char* net{"net"};
-                static constexpr const char* rat{"rat"};
-                static constexpr const char* cbs{"cbs"};
-                static constexpr const char* sms{"sms"};
-                static constexpr const char* sim{"sim"};
-                static constexpr const char* stk{"stk"};
-                static constexpr const char* ussd{"ussd"};
-                static constexpr const char* gprs{"gprs"};
-                static constexpr const char* tty{"tty"};
-                static constexpr const char* gps{"gps"};
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Features"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::vector<std::string> ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Interfaces
-            {
-                static constexpr const char* assisted_satellite_navigation
-                {
-                    "org.ofono.AssistedSatelliteNavigation"
-                };
-                static constexpr const char* audio_settings
-                {
-                    "org.ofono.AudioSettings"
-                };
-                static constexpr const char* call_barring
-                {
-                    "org.ofono.CallBarring"
-                };
-                static constexpr const char* call_forwarding
-                {
-                    "org.ofono.CallForwarding"
-                };
-                static constexpr const char* call_meter
-                {
-                    "org.ofono.CallMeter"
-                };
-                static constexpr const char* call_settings
-                {
-                    "org.ofono.CallSettings"
-                };
-                static constexpr const char* call_volume
-                {
-                    "org.ofono.CallVolume"
-                };
-                static constexpr const char* cell_broadcast
-                {
-                    "org.ofono.CellBroadcast"
-                };
-                static constexpr const char* hands_free
-                {
-                    "org.ofono.Handsfree"
-                };
-                static constexpr const char* location_reporting
-                {
-                    "org.ofono.LocationReporting"
-                };
-                static constexpr const char* message_manager
-                {
-                    "org.ofono.MessageManager"
-                };
-                static constexpr const char* message_waiting
-                {
-                    "org.ofono.MessageWaiting"
-                };
-                static constexpr const char* network_registration
-                {
-                    "org.ofono.NetworkRegistration"
-                };
-                static constexpr const char* phonebook
-                {
-                    "org.ofono.Phonebook"
-                };
-                static constexpr const char* push_notification
-                {
-                    "org.ofono.PushNotification"
-                };
-                static constexpr const char* radio_settings
-                {
-                    "org.ofono.RadioSettings"
-                };
-                static constexpr const char* sim_manager
-                {
-                    "org.ofono.SimManager"
-                };
-                static constexpr const char* smart_messaging
-                {
-                    "org.ofono.SmartMessaging"
-                };
-                static constexpr const char* sim_toolkit
-                {
-                    "org.ofono.SimToolkit"
-                };
-                static constexpr const char* supplementary_services
-                {
-                    "org.ofono.SupplementaryServices"
-                };
-                static constexpr const char* text_telephony
-                {
-                    "org.ofono.TextTelephony"
-                };
-                static constexpr const char* voice_call_manager
-                {
-                    "org.ofono.VoiceCallManager"
-                };
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Interfaces"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::vector<std::string> ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Type
-            {
-                static constexpr const char* test{"test"};
-                static constexpr const char* hfp{"hfp"};
-                static constexpr const char* sap{"sap"};
-                static constexpr const char* hardware{"hardware"};
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Type"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-        };
-
-        struct NetworkRegistration
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"org.ofono.NetworkRegistration"};
-                return s;
-            }            
-
-            struct GetProperties
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"GetProperties"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::map<std::string, core::dbus::types::Variant> ValueType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{1};
-                }
-            };
-
-            struct PropertyChanged
-            {
-                inline static std::string name()
-                {
-                    return "PropertyChanged";
-                }
-
-                typedef NetworkRegistration Interface;
-
-                typedef std::tuple<std::string, core::dbus::types::Variant> ArgumentType;
-            };
-
-            struct Status
-            {
-                enum class Value
-                {
-                    unregistered,
-                    registered,
-                    searching,
-                    denied,
-                    unknown,
-                    roaming
-                };
-
-                static constexpr const char* unregistered
-                {
-                    "unregistered"
-                };
-                static constexpr const char* registered
-                {
-                    "registered"
-                };
-                static constexpr const char* searching
-                {
-                    "searching"
-                };
-                static constexpr const char* denied
-                {
-                    "denied"
-                };
-                static constexpr const char* unknown
-                {
-                    "unknown"
-                };
-                static constexpr const char* roaming
-                {
-                    "roaming"
-                };
-
-                static const char* value_to_string(Value value)
-                {
-                    switch (value)
-                    {
-                    case Value::unregistered: return unregistered;
-                    case Value::registered: return registered;
-                    case Value::searching: return searching;
-                    case Value::denied: return denied;
-                    case Value::unknown: return unknown;
-                    case Value::roaming: return roaming;
-                    }
-
-                    return nullptr;
-                }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Status"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct LocationAreaCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"LocationAreaCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint16_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct CellId
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"CellId"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint32_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileCountryCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileCountryCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileNetworkCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileNetworkCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Technology
-            {
-                static const char* gsm() { return "gsm"; }
-                static const char* edge() { return "edge"; }
-                static const char* umts() { return "umts"; }
-                static const char* hspa() { return "hspa"; }
-                static const char* lte() { return "lte"; }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Technology"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Strength
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Strength"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::int8_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            NetworkRegistration(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  signals
-                  {
-                      object->get_signal<PropertyChanged>()
-                  }
-            {
-            }
-
-            // Calling this function might fail. However, we do not throw and only log
-            // the issue for later forensics.
-            bool refresh_properties() const
-            {
-                auto result = object->invoke_method_synchronously<GetProperties, GetProperties::ValueType>();
-
-                if (result.is_error())
-                {
-                    LOG(WARNING) << "Could not refresh properties for org::Ofono::Modem::NetworkRegistration: " << result.error().print();
-                    return false;
-                }
-
-                properties = result.value();
-                return true;
-            }
-
-            template<typename Property>
-            typename Property::ValueType get(bool refresh = true) const
-            {
-                if (refresh)
-                {
-                    if (not refresh_properties())
-                        return typename Property::ValueType{};
-                }
-
-                auto it = properties.find(Property::name());
-
-                if (it == properties.end())
-                {
-                    VLOG(1) << "Could not find property for name " << Property::name();
-                    return typename Property::ValueType{};
-                }
-
-                return it->second.template as<typename Property::ValueType>();
-            }
-
-            std::shared_ptr<core::dbus::Object> object;
-            mutable GetProperties::ValueType properties;
-
-            struct
-            {
-                core::dbus::Signal<PropertyChanged, PropertyChanged::ArgumentType>::Ptr property_changed;
-            } signals;
-        };
-
-        Modem(const std::shared_ptr<core::dbus::Service>& service,
-              const std::shared_ptr<core::dbus::Object>& object)
-            : service(service),
-              object(object),
-              signals
-              {
-                  object->get_signal<PropertyChanged>()
-              },
-              network_registration{object}
-        {
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-
-        struct
-        {
-            core::dbus::Signal<PropertyChanged, PropertyChanged::ArgumentType>::Ptr property_changed;
-        } signals;
-
-        NetworkRegistration network_registration;
-    };
-
-    Manager(const core::dbus::Bus::Ptr& bus)
-        : service(core::dbus::Service::use_service<org::Ofono>(bus)),
-          object(service->object_for_path(core::dbus::types::ObjectPath("/"))),
-          signals
-          {
-              object->get_signal<ModemAdded>(),
-              object->get_signal<ModemRemoved>()
-          }
-    {
-    }
-
-    Modem modem_for_path(const core::dbus::types::ObjectPath& path) const
-    {
-        return Modem
-        {
-            service,
-            service->object_for_path(path)
-        };
-    }
-
-    void for_each_modem(const std::function<void(const core::dbus::types::ObjectPath&)>& functor) const
-    {
-        auto result = object->invoke_method_synchronously<GetModems, GetModems::ResultType>();
-
-        if (result.is_error())
-            throw std::runtime_error(result.error().print());
-
-        for (const auto& element : result.value())
-        {
-            functor(element.value);
-        }
-    }
-
-    std::shared_ptr<core::dbus::Service> service;
-    std::shared_ptr<core::dbus::Object> object;
-
-    struct
-    {
-        std::shared_ptr<core::dbus::Signal<ModemAdded, ModemAdded::ArgumentType>> modem_added;
-        std::shared_ptr<core::dbus::Signal<ModemRemoved, ModemRemoved::ArgumentType>> modem_removed;
-    } signals;
-};
-};
-}
-
-#endif // LOCATION_CONNECTIVITY_OFONO_H

=== removed file 'src/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location/connectivity/ofono_nm_connectivity_manager.cpp	2016-06-26 21:17:03 +0000
+++ src/location/connectivity/ofono_nm_connectivity_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,782 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-
-#include "ofono_nm_connectivity_manager.h"
-
-#include <core/dbus/dbus.h>
-
-namespace connectivity = com::ubuntu::location::connectivity;
-namespace dbus = core::dbus;
-namespace xdg = org::freedesktop;
-
-namespace
-{
-connectivity::State from_nm_property(std::uint32_t value)
-{
-    return connectivity::State
-    {
-        static_cast<connectivity::State>(value)
-    };
-}
-
-connectivity::Characteristics all_characteristics()
-{
-    return connectivity::Characteristics::connection_has_monetary_costs |
-           connectivity::Characteristics::connection_is_bandwith_limited |
-           connectivity::Characteristics::connection_is_volume_limited;
-}
-}
-
-connectivity::OfonoNmConnectivityManager::OfonoNmConnectivityManager(const core::dbus::Bus::Ptr& bus) : d(bus)
-{
-}
-
-const core::Property<connectivity::State>& connectivity::OfonoNmConnectivityManager::state() const
-{
-    return d.state;
-}
-
-const core::Property<bool>& connectivity::OfonoNmConnectivityManager::is_wifi_enabled() const
-{
-    return d.cached.is_wifi_enabled;
-}
-
-const core::Property<bool>& connectivity::OfonoNmConnectivityManager::is_wwan_enabled() const
-{
-    return d.cached.is_wwan_enabled;
-}
-
-const core::Property<bool>& connectivity::OfonoNmConnectivityManager::is_wifi_hardware_enabled() const
-{
-    return d.cached.is_wifi_hardware_enabled;
-}
-
-const core::Property<bool>& connectivity::OfonoNmConnectivityManager::is_wwan_hardware_enabled() const
-{
-    return d.cached.is_wwan_hardware_enabled;
-}
-
-void connectivity::OfonoNmConnectivityManager::request_scan_for_wireless_networks()
-{
-    std::lock_guard<std::mutex> lg(d.cached.guard);
-
-    for (const auto& pair : d.cached.nm_devices)
-        if (pair.second.type() == xdg::NetworkManager::Device::Type::wifi)
-            pair.second.request_scan();
-}
-
-const core::Signal<>& connectivity::OfonoNmConnectivityManager::wireless_network_scan_finished() const
-{
-    return d.signals.wireless_network_scan_finished;
-}
-
-const core::Signal<connectivity::WirelessNetwork::Ptr>& connectivity::OfonoNmConnectivityManager::wireless_network_added() const
-{
-    return d.signals.wireless_network_added;
-}
-
-const core::Signal<connectivity::WirelessNetwork::Ptr>& connectivity::OfonoNmConnectivityManager::wireless_network_removed() const
-{
-    return d.signals.wireless_network_removed;
-}
-
-void connectivity::OfonoNmConnectivityManager::enumerate_visible_wireless_networks(const std::function<void(const connectivity::WirelessNetwork::Ptr&)>& f) const
-{
-    std::lock_guard<std::mutex> lg(d.cached.guard);
-    for (const auto& wifi : d.cached.wifis)
-        f(wifi.second);
-}
-
-const core::Signal<connectivity::RadioCell::Ptr>& connectivity::OfonoNmConnectivityManager::connected_cell_added() const
-{
-    return d.signals.connected_cell_added;
-}
-
-const core::Signal<connectivity::RadioCell::Ptr>& connectivity::OfonoNmConnectivityManager::connected_cell_removed() const
-{
-    return d.signals.connected_cell_removed;
-}
-
-void connectivity::OfonoNmConnectivityManager::enumerate_connected_radio_cells(const std::function<void(const connectivity::RadioCell::Ptr&)>& f) const
-{
-    std::lock_guard<std::mutex> lg(d.cached.guard);
-    // We only report currently valid cells.
-    for (const auto& cell : d.cached.cells)
-        if (cell.second->is_valid().get())
-            f(cell.second);
-}
-
-const core::Property<connectivity::Characteristics>& connectivity::OfonoNmConnectivityManager::active_connection_characteristics() const
-{
-    return d.active_connection_characteristics;
-}
-
-connectivity::OfonoNmConnectivityManager::Private::Private(const core::dbus::Bus::Ptr& bus)
-    : bus{bus},
-      bus_daemon{std::make_shared<core::dbus::DBus>(bus)}
-{
-    try
-    {
-        setup_radio_stack_access();
-    }
-    catch (const std::exception& e)
-    {
-        SYSLOG(INFO) << "Error while setting up access to the radio stack: " << e.what();
-        // An error occured while setting up access to the radio stack.
-        // For that, we setup watching of registration changes and initialize
-        // the instance later on.
-        modem_manager_watcher = bus_daemon->make_service_watcher(
-                    org::Ofono::name(),
-                    core::dbus::DBus::WatchMode::registration);
-
-        modem_manager_watcher->service_registered().connect([this]()
-        {
-            VLOG(1) << org::Ofono::name() << " got registered on the bus.";
-            dispatcher.service.post([this]()
-            {
-                setup_radio_stack_access();
-            });
-        });
-    }
-
-    try
-    {
-        setup_network_stack_access();
-    }
-    catch (const std::exception& e)
-    {
-        SYSLOG(INFO) << "Error while setting up access to the networking stack: " << e.what();
-        // An error occured while setting up access to the networking stack.
-        // For that, we setup watching of registration changes and initialize
-        // the instance later on.
-        network_manager_watcher = bus_daemon->make_service_watcher(
-                    xdg::NetworkManager::name(),
-                    core::dbus::DBus::WatchMode::registration);
-
-        network_manager_watcher->service_registered().connect([this]()
-        {
-            VLOG(1) << xdg::NetworkManager::name() << " got registered on the bus.";
-            dispatcher.service.post([this]()
-            {
-                setup_network_stack_access();
-            });
-        });
-    }
-}
-
-connectivity::OfonoNmConnectivityManager::Private::~Private()
-{
-    dispatcher.service.stop();
-
-    if (dispatcher.worker.joinable())
-        dispatcher.worker.join();
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::setup_radio_stack_access()
-{
-    modem_manager.reset(new org::Ofono::Manager(bus));
-
-    modem_manager->for_each_modem([this](const core::dbus::types::ObjectPath& path)
-    {
-        try
-        {
-            on_modem_added(path);
-        }
-        catch(const std::runtime_error& e)
-        {
-            VLOG(1) << "Exception while creating connected radio cell: " << e.what();
-        }
-    });
-
-    modem_manager->signals.modem_added->connect([this](const org::Ofono::Manager::ModemAdded::ArgumentType& arg)
-    {
-        try
-        {
-            on_modem_added(std::get<0>(arg));
-        }
-        catch(const std::exception& e)
-        {
-            VLOG(1) << "Exception while adding modem: " << e.what();
-        }
-    });
-
-    modem_manager->signals.modem_removed->connect([this](const core::dbus::types::ObjectPath& path)
-    {
-        try
-        {
-            on_modem_removed(path);
-        }
-        catch(const std::exception& e)
-        {
-            VLOG(1) << "Exception while removing modem: " << e.what();
-        }
-    });
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_modem_added(const core::dbus::types::ObjectPath& path)
-{
-    VLOG(1) << __PRETTY_FUNCTION__;
-
-    auto modem = modem_manager->modem_for_path(path);
-
-    // We immediately make the modem known to the cache, specifically
-    // prior to attempting to create a connected cell.
-    std::unique_lock<std::mutex> ul(cached.guard);
-    auto modem_result = cached.modems.insert(std::make_pair(path, modem));
-
-    // We immediate bail out if insertion into the cache does not succeed.
-    if (not modem_result.second)
-        return;
-
-    // We first wire up to property changes here.
-    modem_result.first->second.signals.property_changed->connect([this, path](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-    {
-        const auto& key = std::get<0>(tuple); VLOG(10) << "Property changed for modem: " << key;
-
-        if (org::Ofono::Manager::Modem::Properties::Interfaces::name() == key)
-        {
-            auto interfaces = std::get<1>(tuple).as<std::vector<std::string> >();
-            if (VLOG_IS_ON(10)) for(const auto& interface : interfaces) VLOG(10) << interface;
-            dispatcher.service.post([this, path, interfaces]()
-            {
-                on_modem_interfaces_changed(path, interfaces);
-            });
-        }
-    });
-
-    // And update our cache of registered cells.
-    auto cell_result = cached.cells.insert(
-                std::make_pair(
-                    modem.object->path(),
-                    std::make_shared<detail::CachedRadioCell>(modem, dispatcher.service)));
-
-    if (not cell_result.second)
-        return;
-
-    // We do not keep the cell alive.
-    std::weak_ptr<detail::CachedRadioCell> wp{cell_result.first->second};
-
-    // We account for a cell becoming invalid and report it as report.
-    cell_result.first->second->is_valid().changed().connect([this, wp](bool valid)
-    {
-        VLOG(10) << "Validity of cell changed: " << std::boolalpha << valid << std::endl;
-
-        auto sp = wp.lock();
-
-        if (not sp)
-            return;
-
-        if (valid)
-            signals.connected_cell_added(sp);
-        else
-            signals.connected_cell_removed(sp);
-    });
-
-    // Cool, we have reached here, updated all our caches and created a connected radio cell.
-    // We are thus good to go and release the lock manually prior to announcing the new cell
-    // to interested parties.
-    ul.unlock();
-    // Announce the newly added cell to API customers, without the lock
-    // on the cache being held.
-    signals.connected_cell_added(cell_result.first->second);
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_modem_removed(const core::dbus::types::ObjectPath& path)
-{
-    VLOG(1) << __PRETTY_FUNCTION__;
-
-    detail::CachedRadioCell::Ptr cell;
-    {
-        std::lock_guard<std::mutex> lg(cached.guard);
-
-        // Update modem and cell cache.
-        auto itc = cached.cells.find(path);
-        auto itm = cached.modems.find(path);
-
-        if (itc != cached.cells.end())
-        {
-            cell = itc->second;
-            cached.cells.erase(itc);
-        }
-
-        if (itm != cached.modems.end())
-        {
-            cached.modems.erase(path);
-        }
-    }
-    // Inform customers of the registered cell being removed, without
-    // the lock on the cache being held.
-    if (cell) signals.connected_cell_removed(cell);
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_modem_interfaces_changed(
-        const core::dbus::types::ObjectPath& path,
-        const std::vector<std::string>& interfaces)
-{
-    std::unique_lock<std::mutex> ul(cached.guard);
-
-    auto itm = cached.modems.find(path);
-    if (itm == cached.modems.end())
-    {
-        VLOG(1) << "Could not find a modem for path " << path.as_string();
-        return;
-    }
-
-    auto itt = cached.cells.find(path);
-    const bool has_cell_for_modem = itt != cached.cells.end();
-
-    auto it = std::find(
-                interfaces.begin(),
-                interfaces.end(),
-                std::string{org::Ofono::Manager::Modem::Properties::Interfaces::network_registration});
-    const bool modem_has_network_registration = it != interfaces.end();
-
-    if (has_cell_for_modem and not modem_has_network_registration)
-    {
-        // A network registration was lost and we remove the corresponding
-        // cell instance from the cache.
-        auto cell = itt->second;
-        cached.cells.erase(itt);
-
-        // Cache is up to date now and we announce the removal of the cell
-        // to API customers, with the lock on the cache not being held.
-        ul.unlock(); signals.connected_cell_removed(cell);
-    } else if (not has_cell_for_modem and modem_has_network_registration)
-    {
-        dispatcher.service.post([this, path]()
-        {
-            std::unique_lock<std::mutex> ul(cached.guard);
-
-            auto itm = cached.modems.find(path);
-            if (itm == cached.modems.end())
-            {
-                VLOG(1) << "Could not find a modem for path " << path.as_string();
-                return;
-            }
-
-            // A new network registration is coming in and we have to create
-            // a corresponding cell instance.
-            auto cell = std::make_shared<detail::CachedRadioCell>(itm->second, dispatcher.service);
-
-            // We do not keep the cell alive.
-            std::weak_ptr<detail::CachedRadioCell> wp{cell};
-
-            // We account for a cell becoming invalid and report it as report.
-            cell->is_valid().changed().connect([this, wp](bool valid)
-            {
-                VLOG(10) << "Validity of cell changed: " << std::boolalpha << valid << std::endl;
-
-                auto sp = wp.lock();
-
-                if (not sp)
-                    return;
-
-                if (valid)
-                    signals.connected_cell_added(sp);
-                else
-                    signals.connected_cell_removed(sp);
-            });
-
-            cached.cells.insert(std::make_pair(path,cell));
-            // Cache is up to date now and we announce the new cell to
-            // API customers, with the lock on the cache not being held.
-            ul.unlock(); signals.connected_cell_added(cell);
-        });
-    }
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::setup_network_stack_access()
-{
-    network_manager.reset(new xdg::NetworkManager(bus));
-
-    network_manager->for_each_device([this](const core::dbus::types::ObjectPath& device_path)
-    {
-        std::unique_lock<std::mutex> ul{cached.guard};
-        on_device_added(device_path, ul);
-    });
-
-    // Query the initial connectivity state
-    state.set(from_nm_property(network_manager->properties.state->get()));
-    // Determine the initial connection characteristics
-    active_connection_characteristics.set(
-                characteristics_for_connection(
-                    network_manager->properties.primary_connection->get()));
-
-    network_manager->signals.device_added->connect([this](const core::dbus::types::ObjectPath& path)
-    {
-        // We dispatch determining the connection characteristics to unblock
-        // the bus here.
-        dispatcher.service.post([this, path]()
-        {
-            std::unique_lock<std::mutex> ul{cached.guard};
-            on_device_added(path, ul);
-        });
-    });
-
-    network_manager->signals.device_removed->connect([this](const core::dbus::types::ObjectPath& path)
-    {
-        // We dispatch determining the connection characteristics to unblock
-        // the bus here.
-        dispatcher.service.post([this, path]()
-        {
-            std::unique_lock<std::mutex> ul{cached.guard};
-            on_device_removed(path, ul);
-        });
-    });
-
-    // And we wire up to property changes here
-    network_manager->signals.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
-    {
-        for (const auto& pair : dict)
-        {
-            VLOG(1) << "Property has changed: " << std::endl
-                    << "  " << pair.first;
-
-            if (xdg::NetworkManager::Properties::State::name() == pair.first)
-            {
-                state.set(from_nm_property(pair.second.as<xdg::NetworkManager::Properties::State::ValueType>()));
-            }
-
-            if (xdg::NetworkManager::Properties::PrimaryConnection::name() == pair.first)
-            {
-                // The primary connection object changed. We iterate over all the devices associated with
-                // the primary connection and determine whether a wwan device is present. If so, we adjust
-                // the characteristics of the connection to have monetary costs associated and to be
-                // bandwidth and volume limited.
-
-                auto path = pair.second.as<core::dbus::types::ObjectPath>();
-
-                // We dispatch determining the connection characteristics to unblock
-                // the bus here.
-                dispatcher.service.post([this, path]()
-                {
-                    active_connection_characteristics = characteristics_for_connection(path);
-                });
-            }
-        }
-    });
-
-    network_manager->signals.state_changed->connect([this](std::uint32_t s)
-    {
-        state.set(from_nm_property(s));
-    });
-
-    // Read initial properties.
-    cached.is_wifi_enabled.set(network_manager->properties.is_wifi_enabled.get());
-    cached.is_wifi_hardware_enabled.set(network_manager->properties.is_wifi_hardware_enabled.get());
-    cached.is_wwan_enabled.set(network_manager->properties.is_wwan_enabled.get());
-    cached.is_wwan_hardware_enabled.set(network_manager->properties.is_wwan_hardware_enabled.get());
-    // And connect to changed signals.
-    network_manager->properties.is_wifi_enabled->changed().connect([this](bool value)
-    {
-        cached.is_wifi_enabled = value;
-    });
-
-    network_manager->properties.is_wifi_hardware_enabled->changed().connect([this](bool value)
-    {
-        cached.is_wifi_hardware_enabled = value;
-    });
-
-    network_manager->properties.is_wwan_enabled->changed().connect([this](bool value)
-    {
-        cached.is_wwan_enabled = value;
-    });
-
-    network_manager->properties.is_wwan_hardware_enabled->changed().connect([this](bool value)
-    {
-        cached.is_wwan_hardware_enabled = value;
-    });
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_device_added(
-        const core::dbus::types::ObjectPath& device_path,
-        std::unique_lock<std::mutex>& ul)
-{
-    if (cached.nm_devices.count(device_path) > 0)
-        return;
-
-    auto device = network_manager->device_for_path(device_path);
-
-    if (device.type() == xdg::NetworkManager::Device::Type::modem)
-    {
-      // Make the device known to the cache.
-      std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device>::iterator it;
-      std::tie(it, std::ignore) = cached.nm_devices.insert(std::make_pair(device_path, device));
-    }
-
-    if (device.type() == xdg::NetworkManager::Device::Type::wifi)
-    {
-        // Make the device known to the cache.
-        std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device>::iterator it;
-        std::tie(it, std::ignore) = cached.nm_devices.insert(std::make_pair(device_path, device));
-
-        // Iterate over all currently known wifis
-        it->second.for_each_access_point([this, device_path, &ul](const core::dbus::types::ObjectPath& path)
-        {
-            try
-            {
-                // We have to make sure that we always hand in a lock that owns the mutex.
-                if (not ul.owns_lock())
-                    ul.lock();
-
-                on_access_point_added(path, device_path, ul);
-            }
-            catch (const std::exception& e)
-            {
-                VLOG(1) << "Error while creating ap/wifi: " << e.what();
-            }
-        });
-
-        it->second.signals.scan_done->connect([this]()
-        {
-            signals.wireless_network_scan_finished();
-        });
-
-        it->second.signals.ap_added->connect([this, device_path](const core::dbus::types::ObjectPath& path)
-        {
-            try
-            {
-                std::unique_lock<std::mutex> ul{cached.guard};
-                on_access_point_added(path, device_path, ul);
-            }
-            catch (const std::exception& e)
-            {
-                VLOG(1) << "Error while creating ap/wifi: " << e.what();
-            }
-        });
-
-        it->second.signals.ap_removed->connect([this](const core::dbus::types::ObjectPath& path)
-        {
-            try
-            {
-                std::unique_lock<std::mutex> ul{cached.guard};
-                on_access_point_removed(path, ul);
-            }
-            catch (const std::exception& e)
-            {
-                VLOG(1) << "Error while removing ap/wifi: " << e.what();
-            }
-        });
-    }
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_device_removed(
-        const core::dbus::types::ObjectPath& path,
-        std::unique_lock<std::mutex>&)
-{
-    cached.nm_devices.erase(path);
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_access_point_added(
-        const core::dbus::types::ObjectPath& ap_path,
-        const core::dbus::types::ObjectPath& device_path,
-        std::unique_lock<std::mutex>& ul)
-{
-    // Let's see if we have a device known for the path. We return early
-    // if we do not know about the device.
-    auto itd = cached.nm_devices.find(device_path);
-    if (itd == cached.nm_devices.end() || itd->second.type() != xdg::NetworkManager::Device::Type::wifi)
-        return;
-
-    xdg::NetworkManager::AccessPoint ap
-    {
-        network_manager->service->object_for_path(ap_path)
-    };
-
-    auto wifi = std::make_shared<detail::CachedWirelessNetwork>(itd->second, ap);
-    cached.wifis[ap_path] = wifi;
-
-    // Let API consumers know that an AP appeared. The lock on the cache is
-    // not held to prevent from deadlocks.
-    ul.unlock(); signals.wireless_network_added(wifi);
-}
-
-void connectivity::OfonoNmConnectivityManager::Private::on_access_point_removed(
-        const core::dbus::types::ObjectPath& ap_path,
-        std::unique_lock<std::mutex>& ul)
-{
-    // Let's see if we know about the wifi. We return early if not.
-    auto itw = cached.wifis.find(ap_path);
-    if (itw == cached.wifis.end())
-        return;
-
-    // Update the cache and keep the wifi object alive until API consumers
-    // have been informed of the wifi going away.
-    connectivity::WirelessNetwork::Ptr wifi = itw->second;
-    cached.wifis.erase(itw);
-
-    // Let API consumers know that an AP disappeared. The lock on the cache is
-    // not held to prevent from deadlocks.
-    ul.unlock(); signals.wireless_network_removed(wifi);
-}
-
-connectivity::Characteristics connectivity::OfonoNmConnectivityManager::Private::characteristics_for_connection(const core::dbus::types::ObjectPath& path)
-{
-    xdg::NetworkManager::ActiveConnection ac
-    {
-        network_manager->service,
-        network_manager->service->object_for_path(path)
-    };
-
-    connectivity::Characteristics characteristics
-    {
-        connectivity::Characteristics::none
-    };
-
-    // We try to enumerate all devices, and might fail if the active connection
-    // went away under our feet. For that, we simply catch all possible exceptions
-    // and silently drop them. In that case, we reset the characteristics to 'none'.
-    try
-    {
-        ac.enumerate_devices([this, &characteristics](const core::dbus::types::ObjectPath& path)
-        {
-            xdg::NetworkManager::Device::Type type{xdg::NetworkManager::Device::Type::unknown};
-            {
-                // We only consider cached devices and do not reach out to enumerate all of the devices
-                // to prevent from excessive dbus roundtrips.
-                std::lock_guard<std::mutex> lg{cached.guard};
-                if (cached.nm_devices.count(path) > 0 )
-                    type = cached.nm_devices.at(path).type();
-            }
-
-            // We interpret a primary connection over a modem device as
-            // having monetary costs (for the data plan), as well as being
-            // bandwidth and volume limited. While this is not true in all
-            // cases, it is good enough as a heuristic and for disabling certain
-            // types of functionality if the data connection goes via a modem device.
-            if (type == xdg::NetworkManager::Device::Type::modem)
-            {
-                characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wwan;
-
-                std::lock_guard<std::mutex> lg(cached.guard);
-
-                for (const auto& pair : cached.modems)
-                {
-                    // This call might throw as it reaches out to ofono to query the current status of the modem.
-                    try
-                    {
-                        auto status = pair.second.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::Status>(false);
-                        if (org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming == status)
-                            characteristics = characteristics | connectivity::Characteristics::connection_is_roaming;
-                    }
-                    catch (const std::exception& e)
-                    {
-                        LOG(WARNING) << e.what();
-                        // And we interpret an exception being thrown conservatively, i.e., we set the
-                        // state to roaming. With that, we prevent enabling expensive data transfers over roaming
-                        // connections unless we could unambigiously determine that we are *not* roaming.
-                        characteristics = characteristics | connectivity::Characteristics::connection_is_roaming;
-                    }
-                }
-
-                characteristics = characteristics | all_characteristics();                
-            } else if (type == xdg::NetworkManager::Device::Type::wifi)
-            {
-                characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wifi;
-            }
-
-        });
-    } catch(...)
-    {
-        // Empty on purpose.
-    }
-
-    LOG(INFO) << characteristics << std::endl;
-    return characteristics;
-}
-
-namespace
-{
-struct Runtime
-{
-    static Runtime& instance()
-    {
-        static Runtime runtime;
-        return runtime;
-    }
-
-    Runtime()
-        : system_bus{std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::system)},
-          executor{core::dbus::asio::make_executor(system_bus)}
-    {
-        system_bus->install_executor(executor);
-
-        worker_thread = std::move(std::thread
-        {
-            [this]()
-            {
-                while(true) {
-                    try
-                    {
-                        system_bus->run();
-                        break;  // run exited normally
-                    }
-                    catch (const std::exception& e)
-                    {
-                        LOG(WARNING) << e.what();
-                    }
-                    catch(...)
-                    {
-                        LOG(WARNING) << "Unexpected exception was raised by the io executor.";
-                    }
-                }
-            }
-        });
-    }
-
-    ~Runtime()
-    {
-        system_bus->stop();
-
-        if (worker_thread.joinable())
-            worker_thread.join();
-    }
-
-    core::dbus::Bus::Ptr system_bus;
-    core::dbus::Executor::Ptr executor;
-    std::thread worker_thread;
-};
-}
-
-#include <location/connectivity/dummy_connectivity_manager.h>
-
-const std::shared_ptr<connectivity::Manager>& connectivity::platform_default_manager()
-{
-    try
-    {
-        static const std::shared_ptr<connectivity::Manager> instance
-        {
-            new connectivity::OfonoNmConnectivityManager
-            {
-                Runtime::instance().system_bus
-            }
-        };
-
-        return instance;
-    }
-    catch(...)
-    {
-    }
-
-    static const std::shared_ptr<connectivity::Manager> dummy_instance
-    {
-        new dummy::ConnectivityManager{}
-    };
-
-    return dummy_instance;
-}

=== removed file 'src/location/connectivity/ofono_nm_connectivity_manager.h'
--- src/location/connectivity/ofono_nm_connectivity_manager.h	2016-08-24 14:12:05 +0000
+++ src/location/connectivity/ofono_nm_connectivity_manager.h	1970-01-01 00:00:00 +0000
@@ -1,185 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-
-#ifndef OFONO_NM_CONNECTIVITY_MANAGER_H_
-#define OFONO_NM_CONNECTIVITY_MANAGER_H_
-
-#include <location/connectivity/manager.h>
-
-#include <location/logging.h>
-
-#include "cached_radio_cell.h"
-#include "cached_wireless_network.h"
-#include "nm.h"
-#include "ofono.h"
-
-#include <core/dbus/bus.h>
-#include <core/dbus/dbus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/service_watcher.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-
-#include <core/dbus/asio/executor.h>
-
-#include "../set_name_for_thread.h"
-
-#include <boost/asio.hpp>
-
-#include <chrono>
-
-namespace dbus = core::dbus;
-
-namespace com { namespace ubuntu { namespace location { namespace connectivity {
-struct LOCATION_DLL_PUBLIC OfonoNmConnectivityManager : public com::ubuntu::location::connectivity::Manager
-{
-    // Creates an instance of the manager, resolving services on the given bus.
-    OfonoNmConnectivityManager(const core::dbus::Bus::Ptr& bus);
-
-    const core::Property<com::ubuntu::location::connectivity::State>& state() const override;
-
-    const core::Property<bool>& is_wifi_enabled() const override;
-
-    const core::Property<bool>& is_wwan_enabled() const override;
-
-    const core::Property<bool>& is_wifi_hardware_enabled() const override;
-
-    const core::Property<bool>& is_wwan_hardware_enabled() const override;
-
-    void request_scan_for_wireless_networks() override;
-
-    const core::Signal<>& wireless_network_scan_finished() const override;
-    const core::Signal<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wireless_network_added() const override;
-    const core::Signal<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wireless_network_removed() const override;
-
-    void enumerate_visible_wireless_networks(const std::function<void(const com::ubuntu::location::connectivity::WirelessNetwork::Ptr&)>& f) const override;
-
-    const core::Signal<com::ubuntu::location::connectivity::RadioCell::Ptr>& connected_cell_added() const override;
-    const core::Signal<com::ubuntu::location::connectivity::RadioCell::Ptr>& connected_cell_removed() const override;
-
-    void enumerate_connected_radio_cells(const std::function<void(const com::ubuntu::location::connectivity::RadioCell::Ptr&)>& f) const override;
-
-    const core::Property<com::ubuntu::location::connectivity::Characteristics>& active_connection_characteristics() const;
-
-    struct Private
-    {
-        Private(const core::dbus::Bus::Ptr& bus);
-        ~Private();
-
-        void setup_radio_stack_access();
-        void on_modem_added(const core::dbus::types::ObjectPath& path);
-        void on_modem_removed(const core::dbus::types::ObjectPath& path);
-        void on_modem_interfaces_changed(const core::dbus::types::ObjectPath& path, const std::vector<std::string>& interfaces);
-
-        // All network stack specific functionality goes here.
-        void setup_network_stack_access();
-        void on_device_added(const core::dbus::types::ObjectPath& device_path, std::unique_lock<std::mutex>& ul);
-        void on_device_removed(const core::dbus::types::ObjectPath& device_path, std::unique_lock<std::mutex>& ul);
-        void on_access_point_added(const core::dbus::types::ObjectPath& ap_path, const core::dbus::types::ObjectPath& device_path, std::unique_lock<std::mutex>& ul);
-        void on_access_point_removed(const core::dbus::types::ObjectPath& ap_path, std::unique_lock<std::mutex>& ul);
-        com::ubuntu::location::connectivity::Characteristics characteristics_for_connection(const core::dbus::types::ObjectPath& path);
-
-        core::dbus::Bus::Ptr bus;
-        std::shared_ptr<core::dbus::DBus> bus_daemon;
-
-        org::freedesktop::NetworkManager::Ptr network_manager;
-        // If we failed to setup the network manager instance on startup,
-        // we watch out for ownership changes on xdg::NetworkManager.
-        std::shared_ptr<core::dbus::ServiceWatcher> network_manager_watcher;
-        org::Ofono::Manager::Ptr modem_manager;
-        // If we failed to setup the modem manager instance on startup,
-        // we watch out for ownership changes on org.ofono.Manager.
-        std::shared_ptr<core::dbus::ServiceWatcher> modem_manager_watcher;
-
-        struct
-        {
-            // The io-service instance we use for dispatching invocations.
-            boost::asio::io_service service;
-
-            // We keep the io_service object alive until someone stops it.
-            boost::asio::io_service::work keep_alive
-            {
-                service
-            };
-
-            // And a dedicated worker thread.
-            std::thread worker
-            {
-                [this]() 
-                {
-                   while(true)
-                   {
-                      try
-                      {
-                          service.run();
-                          break;  // normal exit
-                      }
-                      catch (const std::exception& e)
-                      {
-                          LOG(WARNING) << e.what();
-                      }
-                      catch(...)
-                      {
-                          LOG(WARNING) << "Received unexpected exception.";
-                      }
-                   }
-                }
-            };
-        } dispatcher;
-
-        struct
-        {
-            // We cache the properties as the network stack might not be
-            // initialized after startup.
-            core::Property<bool> is_wifi_enabled{false};
-            core::Property<bool> is_wwan_enabled{false};
-            core::Property<bool> is_wifi_hardware_enabled{false};
-            core::Property<bool> is_wwan_hardware_enabled{false};
-
-            // We guard access to all complex cached types with a mutex.
-            mutable std::mutex guard;
-            std::map<core::dbus::types::ObjectPath, detail::CachedRadioCell::Ptr> cells;
-            std::map<core::dbus::types::ObjectPath, org::Ofono::Manager::Modem> modems;
-            std::map<core::dbus::types::ObjectPath, detail::CachedWirelessNetwork::Ptr> wifis;
-            std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device> nm_devices;
-            std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::ActiveConnection> primary_connection;
-            std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device> primary_connection_devices;
-        } cached;
-
-        struct
-        {
-            core::Signal<> wireless_network_scan_finished;
-            core::Signal<com::ubuntu::location::connectivity::RadioCell::Ptr> connected_cell_added;
-            core::Signal<com::ubuntu::location::connectivity::RadioCell::Ptr> connected_cell_removed;
-            core::Signal<com::ubuntu::location::connectivity::WirelessNetwork::Ptr> wireless_network_added;
-            core::Signal<com::ubuntu::location::connectivity::WirelessNetwork::Ptr> wireless_network_removed;
-        } signals;
-
-        core::Property<com::ubuntu::location::connectivity::State> state;
-        core::Property<com::ubuntu::location::connectivity::Characteristics> active_connection_characteristics;
-    } d;
-};
-}}}}
-
-#endif // OFONO_NM_CONNECTIVITY_MANAGER_H_

=== added file 'src/location/connectivity/w11t.xml'
--- src/location/connectivity/w11t.xml	1970-01-01 00:00:00 +0000
+++ src/location/connectivity/w11t.xml	2017-03-08 11:32:35 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="fi.w1.wpa_supplicant1">
+    <signal name="InterfaceAdded">
+      <arg name="path" type="o"/>
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+    <signal name="InterfaceRemoved">
+      <arg name="path" type="o"/>
+    </signal>
+    <signal name="PropertiesChanged">
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+    <property name="Interfaces" type="ao" access="read"/>
+  </interface>
+
+  <interface name="fi.w1.wpa_supplicant1.Interface">
+    <annotation name="org.gtk.GDBus.C.Name" value="FiW1Wpa_supplicant1WirelessInterface"/>
+    <method name="Scan">
+      <arg name="args" type="a{sv}" direction="in"/>
+    </method>
+    <property name="BSSs" type="ao" access="read"/>
+    <signal name="BSSAdded">
+      <arg name="BSS" type="o"/>
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+    <signal name="BSSRemoved">
+      <arg name="BSS" type="o"/>
+    </signal>
+    <signal name="ScanDone">
+      <arg name="success" type="b"/>
+    </signal>
+  </interface>
+
+  <interface name="fi.w1.wpa_supplicant1.BSS">
+    <property name="BSSID" type="ay" access="read">
+      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="yes"/>
+    </property>
+    <property name="SSID" type="ay" access="read">
+      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="yes"/>
+    </property>
+    <property name="Mode" type="s" access="read"/>
+    <property name="Frequency" type="q" access="read"/>
+    <property name="Signal" type="n" access="read"/>
+    <property name="Age" type="u" access="read"/>
+  </interface>
+</node>

=== added file 'src/location/connectivity/w11t_manager.cpp'
--- src/location/connectivity/w11t_manager.cpp	1970-01-01 00:00:00 +0000
+++ src/location/connectivity/w11t_manager.cpp	2017-03-08 11:32:35 +0000
@@ -0,0 +1,777 @@
+/*
+ * Copyright © 2017 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: Thomas Voß <[e-mail]>
+ */
+
+#include <location/connectivity/w11t_manager.h>
+
+#include <location/dbus/util.h>
+#include <location/glib/util.h>
+
+#include <boost/format.hpp>
+
+namespace w11t = location::connectivity::w11t;
+
+namespace
+{
+std::string byte_array_to_mac_address(const std::uint8_t* data, std::size_t size)
+{
+    std::stringstream ss;
+    for (std::size_t i = 0; i < size; i++)
+        ss << (i > 0 ? ":" : "") << (boost::format("%02x") % std::uint32_t(data[i])).str();
+
+    return ss.str();
+}
+}
+
+w11t::BSS::Mode w11t::BSS::mode_from_string(const std::string& mode)
+{
+    if (mode == "ad-hoc")
+        return Mode::adhoc;
+    else if (mode == "infrastructure")
+        return Mode::infrastructure;
+    return Mode::unknown;
+}
+
+void w11t::BSS::create(
+        const glib::SharedObject<GDBusConnection>& connection,
+        const std::string& path, const std::function<void(const Result<Ptr>&)>& cb)
+{
+    fi_w1_wpa_supplicant1_bss_proxy_new(
+                connection.get(), G_DBUS_PROXY_FLAGS_NONE, Supplicant::name(), path.c_str(),
+                nullptr, on_proxy_ready, new ProxyCreationContext{connection, cb});
+}
+
+std::string w11t::BSS::path() const
+{
+    char* object_path{nullptr};
+    g_object_get(proxy_.get(), "g-object-path", &object_path, nullptr);
+    return std::string{object_path};
+}
+
+const core::Property<std::chrono::system_clock::time_point>& w11t::BSS::last_seen() const
+{
+    return last_seen_;
+}
+
+const core::Property<std::string>& w11t::BSS::bssid() const
+{
+    return bssid_;
+}
+
+const core::Property<std::string>& w11t::BSS::ssid() const
+{
+    return ssid_;
+}
+
+const core::Property<w11t::BSS::Mode>& w11t::BSS::mode() const
+{
+    return mode_;
+}
+
+const core::Property<w11t::BSS::Frequency>& w11t::BSS::frequency() const
+{
+    return frequency_;
+}
+
+const core::Property<w11t::BSS::SignalStrength>& w11t::BSS::signal_strength() const
+{
+    return signal_strength_;
+}
+
+void w11t::BSS::on_proxy_ready(
+        GObject* source_object, GAsyncResult* res, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(source_object);
+
+    if (auto context = static_cast<ProxyCreationContext*>(user_data))
+    {
+        GError* error{nullptr};
+        auto proxy = fi_w1_wpa_supplicant1_bss_proxy_new_finish(res, &error);
+
+        if (error)
+        {
+            context->cb(make_error_result<Ptr>(glib::wrap_error_as_exception(error)));
+        }
+        else
+        {
+            try
+            {
+                Ptr sp{new BSS{context->connection, glib::make_shared_object(proxy)}};
+                context->cb(make_result(sp->finalize_construction()));
+            }
+            catch (...)
+            {
+                context->cb(std::current_exception());
+            }
+        }
+
+        delete context;
+    }
+}
+
+void w11t::BSS::on_mode_changed(
+        GObject* object, GParamSpec* spec, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object, spec);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+            sp->mode_ = BSS::mode_from_string(fi_w1_wpa_supplicant1_bss_get_mode(sp->proxy_.get()));
+    }
+}
+
+void w11t::BSS::on_frequency_changed(
+        GObject* object, GParamSpec* spec, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object, spec);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+            sp->frequency_ = Frequency(fi_w1_wpa_supplicant1_bss_get_frequency(sp->proxy_.get()));
+    }
+}
+
+void w11t::BSS::on_signal_changed(
+        GObject* object, GParamSpec* spec, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object, spec);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+            sp->signal_strength_ = SignalStrength(fi_w1_wpa_supplicant1_bss_get_signal(sp->proxy_.get()));
+    }
+}
+
+void w11t::BSS::on_age_changed(
+        GObject* object, GParamSpec* spec, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object, spec);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+            sp->last_seen_ = std::chrono::system_clock::now() - std::chrono::seconds{
+                    fi_w1_wpa_supplicant1_bss_get_age(sp->proxy_.get())};
+    }
+}
+
+w11t::BSS::BSS(const glib::SharedObject<GDBusConnection>& connection,
+               const glib::SharedObject<FiW1Wpa_supplicant1BSS>& proxy)
+    : connection_{connection},
+      proxy_{proxy}
+{
+    
+    auto variant = fi_w1_wpa_supplicant1_bss_get_bssid(proxy_.get());
+    if (variant)
+    {
+        gsize elements{0}; auto data = g_variant_get_fixed_array(variant, &elements, sizeof(guint8));
+        if (data)
+        {
+            bssid_.set(byte_array_to_mac_address(reinterpret_cast<const std::uint8_t*>(data), elements));
+        }
+        else
+        {
+            throw std::runtime_error{"Missing bssid"};
+        }
+    }
+    variant = fi_w1_wpa_supplicant1_bss_get_ssid(proxy_.get());
+    if (variant)
+    {
+        gsize elements{0}; auto data = g_variant_get_fixed_array(variant, &elements, sizeof(guint8));
+        if (data)
+            ssid_.set(std::string(reinterpret_cast<const char*>(data), elements));
+    }
+
+    mode_.set(mode_from_string(fi_w1_wpa_supplicant1_bss_get_mode(proxy_.get())));
+    frequency_.set(Frequency(fi_w1_wpa_supplicant1_bss_get_frequency(proxy_.get())));
+    signal_strength_.set(SignalStrength(fi_w1_wpa_supplicant1_bss_get_signal(proxy_.get())));
+    last_seen_.set(std::chrono::system_clock::now() - std::chrono::seconds(fi_w1_wpa_supplicant1_bss_get_age(proxy_.get())));
+}
+
+w11t::BSS::Ptr w11t::BSS::finalize_construction()
+{
+    auto sp = shared_from_this();
+    std::weak_ptr<BSS> wp{sp};
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "notify::mode",
+                          G_CALLBACK(on_mode_changed),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "notify::frequency",
+                          G_CALLBACK(on_frequency_changed),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "notify::signal",
+                          G_CALLBACK(on_signal_changed),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "notify::age",
+                          G_CALLBACK(on_age_changed),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    return sp;
+}
+
+void w11t::Interface::create(
+        const glib::SharedObject<GDBusConnection>& connection,
+        const std::string& path, const Callback& cb)
+{
+    fiw1wpa_supplicant1wirelessinterface_proxy_new(
+                connection.get(), G_DBUS_PROXY_FLAGS_NONE, Supplicant::name(), path.c_str(),
+                nullptr, on_proxy_ready, new ProxyCreationContext{connection, cb});
+}
+
+void w11t::Interface::request_scan()
+{
+    GVariantBuilder builder; g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
+    g_variant_builder_add(&builder, "{sv}", "Type", g_variant_new_string("active"));
+
+    fiw1wpa_supplicant1wirelessinterface_call_scan(
+                proxy_.get(), g_variant_builder_end(&builder), nullptr, nullptr, nullptr);
+}
+
+std::string w11t::Interface::path() const
+{
+    char* object_path{nullptr};
+    g_object_get(proxy_.get(), "g-object-path", &object_path, nullptr);
+    return std::string{object_path};
+}
+
+const core::Property<std::vector<w11t::BSS::Ptr>>& w11t::Interface::bsss() const
+{
+    return bsss_;
+}
+
+const core::Signal<bool>& w11t::Interface::scan_done() const
+{
+    return scan_done_;
+}
+
+const core::Signal<w11t::BSS::Ptr>& w11t::Interface::bss_added() const
+{
+    return bss_added_;
+}
+
+const core::Signal<w11t::BSS::Ptr>& w11t::Interface::bss_removed() const
+{
+    return bss_removed_;
+}
+
+void w11t::Interface::on_proxy_ready(
+        GObject* source_object, GAsyncResult* res, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(source_object);
+
+    if (auto context = static_cast<ProxyCreationContext*>(user_data))
+    {
+        GError* error{nullptr};
+        auto proxy = fiw1wpa_supplicant1wirelessinterface_proxy_new_finish(res, &error);
+
+        if (error)
+        {
+            context->cb(make_error_result<Ptr>(glib::wrap_error_as_exception(error)));
+        }
+        else
+        {
+            Ptr sp{new Interface{context->connection, glib::make_shared_object(proxy)}};
+            context->cb(make_result(sp->finalize_construction()));
+        }
+
+        delete context;
+    }
+}
+
+void w11t::Interface::handle_scan_done(
+        FiW1Wpasupplicant1WirelessInterface* object, gboolean arg_success, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+        {
+            sp->scan_done_(arg_success);
+        }
+    }
+}
+
+void w11t::Interface::handle_bss_added(
+        FiW1Wpasupplicant1WirelessInterface* object, const char* arg_path, GVariant* properties, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object, properties);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+        {
+            BSS::create(sp->connection_, arg_path, [sp](const Result<BSS::Ptr>& result)
+            {
+                if (result)
+                {
+                    auto bss = result.value();
+
+                    sp->bsss_.update([bss](std::vector<BSS::Ptr>& value) -> bool
+                    {
+                        value.push_back(bss);
+                        return true;
+                    });
+
+                    sp->bss_added_(bss);
+                }
+            });
+        }
+    }
+}
+
+void w11t::Interface::handle_bss_removed(
+        FiW1Wpasupplicant1WirelessInterface* object, const char* arg_path, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(object);
+
+    if (auto holder = static_cast<Holder*>(user_data))
+    {
+        if (auto sp = holder->value.lock())
+        {
+            BSS::Ptr removed;
+            sp->bsss_.update([arg_path, &removed](std::vector<BSS::Ptr>& value) -> bool
+            {
+                auto it = std::find_if(value.begin(), value.end(), [arg_path](const BSS::Ptr& bss)
+                {
+                    return bss->path() == arg_path;
+                });
+
+                if (it != value.end())
+                {
+                    removed = *it;
+                    value.erase(it);
+                }
+
+                return it != value.end();
+            });
+
+            if (removed)
+                sp->bss_removed_(removed);
+        }
+    }
+}
+
+w11t::Interface::Interface(const glib::SharedObject<GDBusConnection>& connection,
+                           const glib::SharedObject<FiW1Wpasupplicant1WirelessInterface>& proxy)
+    : connection_{connection},
+      proxy_{proxy}
+{
+}
+
+w11t::Interface::Ptr w11t::Interface::finalize_construction()
+{
+    auto sp = shared_from_this();
+    std::weak_ptr<Interface> wp{sp};
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "scan-done",
+                          G_CALLBACK(handle_scan_done),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "bssadded",
+                          G_CALLBACK(handle_bss_added),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    g_signal_connect_data(G_OBJECT(proxy_.get()), "bssremoved",
+                          G_CALLBACK(handle_bss_removed),
+                          new Holder{wp}, Holder::closure_notify, GConnectFlags(0));
+
+    auto iterator = fiw1wpa_supplicant1wirelessinterface_get_bsss(proxy_.get());
+    while (iterator && *iterator)
+    {
+        BSS::create(connection_, *iterator, [this, sp](const Result<BSS::Ptr>& result)
+        {
+            if (result)
+            {
+                bsss_.update([bss = result.value()](std::vector<BSS::Ptr>& value) -> bool
+                {
+                    value.push_back(bss);
+                    return true;
+                });
+            }
+        });
+
+        ++iterator;
+    }
+
+    return sp;
+}
+
+void w11t::Supplicant::create(const Callback& cb)
+{
+    g_bus_get(G_BUS_TYPE_SYSTEM, nullptr, on_bus_ready, new BusCreationContext{cb});
+}
+
+const core::Property<std::vector<w11t::Interface::Ptr>>& w11t::Supplicant::interfaces() const
+{
+    return interfaces_;
+}
+
+const core::Signal<w11t::Interface::Ptr>& w11t::Supplicant::interface_removed() const
+{
+    return interface_removed_;
+}
+
+const core::Signal<w11t::Interface::Ptr>& w11t::Supplicant::interface_added() const
+{
+    return interface_added_;
+}
+
+void w11t::Supplicant::on_bus_ready(
+        GObject* source_object, GAsyncResult* res, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(source_object);
+
+    if (auto context = static_cast<BusCreationContext*>(user_data))
+    {
+        GError* error{nullptr};
+        auto connection = glib::make_shared_object(g_bus_get_finish(res, &error));
+
+        if (error)
+        {
+            context->cb(make_error_result<Ptr>(glib::wrap_error_as_exception(error)));
+        }
+        else
+        {
+            fi_w1_wpa_supplicant1_proxy_new(
+                        connection.get(), G_DBUS_PROXY_FLAGS_NONE, Supplicant::name(), Supplicant::path(),
+                        nullptr, on_proxy_ready, new ProxyCreationContext{connection, context->cb});
+        }
+        delete context;
+    }
+}
+
+void w11t::Supplicant::on_proxy_ready(
+        GObject* source_object, GAsyncResult* res, gpointer user_data)
+{
+    LOCATION_DBUS_TRACE_STATIC_TRAMPOLIN;
+    boost::ignore_unused(source_object);
+
+    if (auto context = static_cast<ProxyCreationContext*>(user_data))
+    {
+        GError* error{nullptr};
+        auto proxy = fi_w1_wpa_supplicant1_proxy_new_finish(res, &error);
+
+        if (error)
+        {
+            context->cb(make_error_result<Ptr>(glib::wrap_error_as_exception(error)));
+        }
+        else
+        {
+            Ptr sp{new Supplicant{context->connection, glib::make_shared_object(proxy)}};
+            context->cb(make_result(sp->finalize_construction()));
+        }
+
+        delete context;
+    }
+}