Merge lp:~thomas-voss/location-service/make-client-resilient-against-service-going-away into lp:location-service

[Thomas Voß]

Make stub::Session resilient against the service going away.

Make stub::Session resilient against the service going away.

[Simon Fels (morphis)]

LGTM

review: Approve

=== modified file 'src/location/dbus/stub/session.cpp'
--- src/location/dbus/stub/session.cpp	2017-03-04 21:43:23 +0000
+++ src/location/dbus/stub/session.cpp	2017-03-11 21:15:41 +0000
@@ -191,13 +191,16 @@
     {
         if (auto thiz = holder->value.lock())
         {
-            auto update =
-                location::dbus::decode<
-                    location::Update<location::Position>
-                >(com_ubuntu_location_service_session_get_position(thiz->session_.get()));
+            if (auto variant = com_ubuntu_location_service_session_get_position(thiz->session_.get()))
+            {
+                auto update =
+                    location::dbus::decode<
+                        location::Update<location::Position>
+                    >(variant);
 
-            if (update)
-                thiz->updates().position = *update;
+                if (update)
+                    thiz->updates().position = *update;
+            }
         }
     }
 }
@@ -212,13 +215,16 @@
     {
         if (auto thiz = holder->value.lock())
         {
-            auto update =
-                    location::dbus::decode<
-                        location::Update<units::Degrees>
-                    >(com_ubuntu_location_service_session_get_heading(thiz->session_.get()));
+            if (auto variant = com_ubuntu_location_service_session_get_heading(thiz->session_.get()))
+            {
+                auto update =
+                        location::dbus::decode<
+                            location::Update<units::Degrees>
+                        >(variant);
 
-            if (update)
-                thiz->updates().heading = *update;
+                if (update)
+                    thiz->updates().heading = *update;
+            }
         }
     }
 }
@@ -233,13 +239,16 @@
     {
         if (auto thiz = holder->value.lock())
         {
-            auto update =
-                    location::dbus::decode<
-                        location::Update<units::MetersPerSecond>
-                    >(com_ubuntu_location_service_session_get_velocity(thiz->session_.get()));
+            if (auto variant = com_ubuntu_location_service_session_get_velocity(thiz->session_.get()))
+            {
+                auto update =
+                        location::dbus::decode<
+                            location::Update<units::MetersPerSecond>
+                        >(variant);
 
-            if (update)
-                thiz->updates().velocity = *update;
+                if (update)
+                    thiz->updates().velocity = *update;
+            }
         }
     }
 }