Merge lp:~charlesk/indicator-location/lp-1348334-ualc-status into lp:indicator-location/14.10

[Charles Kerr]

Fix bug that let controller-ualc's state get out of sync with the platform-api's ualc state.

Fix bug that let controller-ualc's state get out of sync with the platform-api's ualc state.

when src/controller-ualc.cc gets a state change notification from ualc, get an up-to-date status by calling ua_location_service_controller_query_status().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-location-ci/40/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'src/controller-ualc.cc'
--- src/controller-ualc.cc	2014-01-29 00:21:10 +0000
+++ src/controller-ualc.cc	2014-08-07 19:50:43 +0000
@@ -32,10 +32,7 @@
                                                              on_ualc_status_changed,
                                                              this);
 
-  // query the ualc to bootstrap our initial status
-  UALocationServiceStatusFlags initial_status;
-  if (ua_location_service_controller_query_status (ualc, &initial_status) == U_STATUS_SUCCESS)
-    set_status (initial_status);
+  update_status();
 }
 
 UbuntuAppLocController :: ~UbuntuAppLocController ()
@@ -45,17 +42,25 @@
 }
 
 void
-UbuntuAppLocController :: on_ualc_status_changed (UALocationServiceStatusFlags flags, void *vself)
+UbuntuAppLocController :: on_ualc_status_changed (UALocationServiceStatusFlags /*flags*/, void *vself)
 {
-  static_cast<UbuntuAppLocController*>(vself)->set_status (flags);
+  static_cast<UbuntuAppLocController*>(vself)->update_status();
 }
 
 void
-UbuntuAppLocController :: set_status (UALocationServiceStatusFlags new_status)
+UbuntuAppLocController :: update_status ()
 {
   const bool loc_was_enabled = is_location_service_enabled();
   const bool gps_was_enabled = is_gps_enabled();
-  current_status = new_status;
+
+  // update this.current_status with a fresh ualc status
+  UALocationServiceStatusFlags flags;
+  if (ua_location_service_controller_query_status (ualc, &flags) == U_STATUS_SUCCESS)
+    {
+      g_debug("%s %s updating ualc controller status with flags: %d", G_STRLOC, G_STRFUNC, (int)flags);
+      current_status = flags;
+    }
+
   const bool loc_is_enabled = is_location_service_enabled();
   const bool gps_is_enabled = is_gps_enabled();
 
@@ -63,7 +68,7 @@
     notify_location_service_enabled (loc_is_enabled);
 
   if (gps_was_enabled != gps_is_enabled)
-      notify_gps_enabled (gps_is_enabled);
+    notify_gps_enabled (gps_is_enabled);
 }
 
 /***

=== modified file 'src/controller-ualc.h'
--- src/controller-ualc.h	2014-01-26 21:37:12 +0000
+++ src/controller-ualc.h	2014-08-07 19:50:43 +0000
@@ -46,7 +46,7 @@
     UbuntuApplicationLocationServiceController * ualc;
 
     static void on_ualc_status_changed (UALocationServiceStatusFlags, void *vself);
-    void set_status (UALocationServiceStatusFlags);
+    void update_status ();
 };
 
 #endif // __INDICATOR_LOCATION_CONTROLLER_UALC__H__