Merge lp:~thomas-voss/location-service/fix-settings-not-being-applied into lp:location-service/15.04

[Thomas Voß]

Fix settings not being applied correctly.

Fix settings not being applied correctly.

=== modified file 'src/location_service/com/ubuntu/location/service/daemon.cpp'
--- src/location_service/com/ubuntu/location/service/daemon.cpp	2015-11-26 08:28:38 +0000
+++ src/location_service/com/ubuntu/location/service/daemon.cpp	2015-12-09 15:21:25 +0000
@@ -181,7 +181,7 @@
         trap->stop();
     });
 
-    auto runtime = location::service::Runtime::create();
+    auto runtime = location::service::Runtime::create(4);
 
     const location::Configuration empty_provider_configuration;
 

=== modified file 'src/location_service/com/ubuntu/location/service/implementation.cpp'
--- src/location_service/com/ubuntu/location/service/implementation.cpp	2015-11-19 09:55:37 +0000
+++ src/location_service/com/ubuntu/location/service/implementation.cpp	2015-12-09 15:21:25 +0000
@@ -156,10 +156,12 @@
     std::weak_ptr<session::Interface> session_weak{session_iface};
     session_iface->updates().position_status.changed().connect([this, session_weak](const session::Interface::Updates::Status& status)
     {
-        cul::Optional<cul::Update<cul::Position>> last_known_position =
-            configuration.engine->updates.last_known_location.get();
-        if (last_known_position &&
-            status == culs::session::Interface::Updates::Status::enabled)
+        cul::Optional<cul::Update<cul::Position>> last_known_position = configuration.engine->updates.last_known_location.get();
+        bool has_last_known_position = last_known_position ? true : false;
+        bool is_session_enabled = status == culs::session::Interface::Updates::Status::enabled;
+        bool is_session_on_or_active = configuration.engine->configuration.engine_state != Engine::Status::off;
+
+        if (has_last_known_position && is_session_enabled && is_session_on_or_active)
         {
             // Immediately send the last known position to the client
             if (auto session_iface = session_weak.lock())

=== modified file 'src/location_service/com/ubuntu/location/service/provider_daemon.cpp'
--- src/location_service/com/ubuntu/location/service/provider_daemon.cpp	2015-12-02 12:00:25 +0000
+++ src/location_service/com/ubuntu/location/service/provider_daemon.cpp	2015-12-09 15:21:25 +0000
@@ -112,7 +112,7 @@
 {
 std::shared_ptr<location::service::Runtime> runtime()
 {
-    static const auto inst = location::service::Runtime::create(1);
+    static const auto inst = location::service::Runtime::create(2);
     return inst;
 }
 }