Merge lp:~thomas-voss/platform-api/fix-1348334 into lp:platform-api

[Thomas Voß]

Implement installation of changed handlers.
Subscribe to state properties.

Implement installation of changed handlers.
Subscribe to state properties.

[lp:~thomas-voss/platform-api/fix-1348334]

255. By Thomas Voß on 2014-08-06

Fix FTBFS.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/platform-api-ci/351/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/84/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/351/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/platform-api-ci/352/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/352/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

comments inline

[lp:~thomas-voss/platform-api/fix-1348334]

256. By Thomas Voß on 2014-08-12

Address reviewer comments.

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'src/ubuntu/application/common/application/location/controller.cpp'
--- src/ubuntu/application/common/application/location/controller.cpp	2014-07-28 20:14:23 +0000
+++ src/ubuntu/application/common/application/location/controller.cpp	2014-08-12 09:17:31 +0000
@@ -42,8 +42,17 @@
     void *context)
 {
     (void) controller;
-    (void) handler;
-    (void) context;
+
+    try
+    {
+        Instance::instance().set_changed_handler_with_context(handler, context);
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_set_status_changed_handler: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_set_status_changed_handler: error accessing instance." << std::endl;
+    }
 }
 
 UStatus

=== modified file 'src/ubuntu/application/common/application/location/instance.h'
--- src/ubuntu/application/common/application/location/instance.h	2014-07-28 20:14:23 +0000
+++ src/ubuntu/application/common/application/location/instance.h	2014-08-12 09:17:31 +0000
@@ -21,6 +21,8 @@
 
 #include "ubuntu/visibility.h"
 
+#include "ubuntu/application/location/controller.h"
+
 #include <com/ubuntu/location/service/stub.h>
 
 #include <core/dbus/resolver.h>
@@ -42,13 +44,64 @@
         return service;
     }
 
+    void set_changed_handler_with_context(
+            UALocationServiceStatusChangedHandler handler,
+            void* context)
+    {
+        changed_handler = handler;
+        changed_handler_context = context;
+    }
+
   private:
-    Instance() : bus(std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::system)),
-                 executor(core::dbus::asio::make_executor(bus)),
-                 service(core::dbus::resolve_service_on_bus<
-                            com::ubuntu::location::service::Interface,
-                            com::ubuntu::location::service::Stub
-                         >(bus))
+    Instance()
+        : bus(std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::system)),
+          executor(core::dbus::asio::make_executor(bus)),
+          service(core::dbus::resolve_service_on_bus<
+                    com::ubuntu::location::service::Interface,
+                    com::ubuntu::location::service::Stub
+                  >(bus)),
+          connections
+          {
+              service->does_satellite_based_positioning().changed().connect([this](bool value)
+              {
+                  // Update our cached value.
+                  if (value)
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_GPS_ENABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_GPS_DISABLED;
+                  }
+                  else
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_GPS_DISABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_GPS_ENABLED;
+                  }
+
+                  // And notify change handler if one is set.
+                  if (changed_handler)
+                      changed_handler(cached_state_flags, changed_handler_context);
+              }),
+              service->is_online().changed().connect([this](bool value)
+              {
+                  // Update our cached value.
+                  if (value)
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_ENABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_DISABLED;
+                  }
+                  else
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_DISABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_ENABLED;
+                  }
+
+                  // And notify change handler if one is set.
+                  if (changed_handler)
+                      changed_handler(cached_state_flags, changed_handler_context);
+              })
+          },
+          cached_state_flags{0},
+          changed_handler{nullptr},
+          changed_handler_context{nullptr}
     {
         bus->install_executor(executor);
         worker = std::move(std::thread([&]() { bus->run(); }));
@@ -70,8 +123,21 @@
 
     core::dbus::Bus::Ptr bus;
     core::dbus::Executor::Ptr executor;
+    std::thread worker;
+
     com::ubuntu::location::service::Interface::Ptr service;
-    std::thread worker;
+
+    // All event connections go here.
+    struct
+    {
+        core::ScopedConnection on_does_satellite_based_positioning_changed;
+        core::ScopedConnection on_is_online_changed;
+    } connections;
+
+    // All change-handler specifics go here.
+    UALocationServiceStatusFlags cached_state_flags;
+    UALocationServiceStatusChangedHandler changed_handler;
+    void* changed_handler_context;
 };
 
 #endif // INSTANCE_H_