Merge lp:~rsalveti/location-service/syncing-vivid into lp:location-service/rtm-14.09

[Ricardo Salveti]

* Make sure that cached modems are considered as well when calculating connection characteristics.
* Increase default timeout for downloading gps xtra data. Fixes: #1447161
* Improve the selection of the bag of providers to ensure that the locations used are within a reasonable time margin.
* Remove the pimpl implementation from the providers and hide their public headers because they should only be used within the project.
* If an exception is thrown from the io_executor run method it must be caught, logger and continued with the main loop.

Sync from Vivid.

[lp:~rsalveti/location-service/syncing-vivid]

194. By Ricardo Salveti on 2015-05-03

* Make sure that cached modems are considered as well when calculating
  connection characteristics (LP: #1441619)
* Improve the selection of the bag of providers to ensure that the
  locations used are within a reasonable time margin.
* Remove the pimpl implementation from the providers and hide their
  public headers because they should only be used within the project.
* If an exception is thrown from the io_executor run method it must be
  caught, logger and continued with the main loop.
* Increase default timeout for downloading gps xtra data.
  (LP: #1447161)

[Thomas Voß (thomas-voss)]

Not sure this change is included here, but NM broke its dbus interface for the data type of the LastSeen timestamp from rtm -> vivid. If this is meant to land for RTM, we have to be very careful about that particular change.

review: Needs Information

[Ricardo Salveti (rsalveti)]

Rev 193 is that revert.

[Thomas Voß (thomas-voss)]

With that: LGTM.

review: Approve

[Manuel de la Peña (mandel)]

Looking good, awesome to get this to RTM!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-13 13:54:26 +0000
+++ debian/changelog	2015-05-03 15:50:48 +0000
@@ -1,3 +1,72 @@
+location-service (2.1+15.04.20150427.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Manuel de la Pena ]
+  * Make sure that cached modems are considered as well when calculating
+    connection characteristics (LP: #1441619)
+  * Improve the selection of the bag of providers to ensure that the
+    locations used are within a reasonable time margin.
+  * Remove the pimpl implementation from the providers and hide their
+    public headers because they should only be used within the project.
+  * If an exception is thrown from the io_executor run method it must be
+    caught, logger and continued with the main loop.
+
+  [ Thomas Voß ]
+  * Increase default timeout for downloading gps xtra data.
+    (LP: #1447161)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Sun, 03 May 2015 10:46:33 -0500
+
+location-service (2.1+15.04.20150427.1-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Manuel de la Pena ]
+  * Make sure that cached modems are considered as well when calculating
+    connection characteristics.
+
+ -- CI Train Bot <[e-mail]>  Mon, 27 Apr 2015 22:55:52 +0000
+
+location-service (2.1+15.04.20150424-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Manuel de la Pena ]
+  * Improve the selection of the bag of providers to ensure that the
+    locations used are within a reasonable time margin.
+  * Remove the pimpl implementation from the providers and hide their
+    public headers because they should only be used within the project.
+
+  [ Thomas Voß ]
+  * Increase default timeout for downloading gps xtra data. (LP:
+    #1447161)
+
+ -- CI Train Bot <[e-mail]>  Fri, 24 Apr 2015 14:46:59 +0000
+
+location-service (2.1+15.04.20150417-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Manuel de la Pena ]
+  * If an exception is thrown from the io_executor run method it must be
+    caught, logger and continued with the main loop.
+
+ -- CI Train Bot <[e-mail]>  Fri, 17 Apr 2015 09:45:52 +0000
+
+location-service (2.1+15.04.20150226-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * Launchpad automatic translations update. added: po/af.po po/bg.po
+    po/sk.po
+  * New rebuild forced.
+
+  [ thomas-voss ]
+  * Account for dbus interface breakage in NM from 0.9.8.8 -> 0.9.10.0.
+
+ -- CI Train Bot <[e-mail]>  Thu, 26 Feb 2015 19:53:44 +0000
+
 location-service (2.1+15.04.20150213-0ubuntu1) vivid; urgency=medium
 
   [ thomas-voss ]

=== removed directory 'include/location_service/com/ubuntu/location/providers/geoclue'
=== removed directory 'include/location_service/com/ubuntu/location/providers/skyhook'
=== added file 'po/aa.po'
--- po/aa.po	1970-01-01 00:00:00 +0000
+++ po/aa.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Afar translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-04-05 19:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afar <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr "Deber sinni abnisso away elle tan arac kok taaxigem faxxa."
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr "%1% away elle tan arac kok yaaxigem faxa."

=== added file 'po/af.po'
--- po/af.po	1970-01-01 00:00:00 +0000
+++ po/af.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Afrikaans translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-02-25 20:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr "'n Onbegrensde program wil toegang to jou posisie hê."
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr "%1% wil toegang to jou posisie hê."

=== modified file 'po/am.po'
--- po/am.po	2015-01-15 06:05:52 +0000
+++ po/am.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ar.po'
--- po/ar.po	2015-01-15 06:05:52 +0000
+++ po/ar.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ast.po'
--- po/ast.po	2015-01-15 06:05:52 +0000
+++ po/ast.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/az.po'
--- po/az.po	2015-01-28 06:29:29 +0000
+++ po/az.po	2015-05-03 15:50:48 +0000
@@ -14,14 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
-"X-Generator: Launchpad (build 17306)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr ""
+msgstr "Məhdudiyyətsiz tətbiq sizin hazırki məkanınız üçün icazə istəyir."
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format
 msgid "%1% wants to access your current location."
-msgstr ""
+msgstr "%1% sizin hazırki məkanınız üçün icazə istəyir."

=== added file 'po/bg.po'
--- po/bg.po	1970-01-01 00:00:00 +0000
+++ po/bg.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Bulgarian translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-02-23 11:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr ""
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr ""

=== modified file 'po/bs.po'
--- po/bs.po	2015-01-15 06:05:52 +0000
+++ po/bs.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ca.po'
--- po/ca.po	2015-01-15 06:05:52 +0000
+++ po/ca.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/[e-mail]'
--- po/[e-mail]	2015-01-15 06:05:52 +0000
+++ po/[e-mail]	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/cs.po'
--- po/cs.po	2015-01-15 06:05:52 +0000
+++ po/cs.po	2015-05-03 15:50:48 +0000
@@ -8,20 +8,20 @@
 "Project-Id-Version: location-service\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-09-19 01:04+0200\n"
-"PO-Revision-Date: 2014-10-12 18:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-02-16 07:46+0000\n"
+"Last-Translator: prom <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr ""
+msgstr "Neznámá aplikace požaduje přístup k vaší současné poloze."
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format
 msgid "%1% wants to access your current location."
-msgstr ""
+msgstr "%1% požaduje přístup k vaší současné poloze."

=== modified file 'po/da.po'
--- po/da.po	2015-01-15 06:05:52 +0000
+++ po/da.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/de.po'
--- po/de.po	2015-01-15 06:05:52 +0000
+++ po/de.po	2015-05-03 15:50:48 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 "Language: DE\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170

=== modified file 'po/el.po'
--- po/el.po	2015-01-15 06:05:52 +0000
+++ po/el.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2015-01-15 06:05:52 +0000
+++ po/en_AU.po	2015-05-03 15:50:48 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr ""
+msgstr "An unconfined application wants to access your current location."
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2015-01-15 06:05:52 +0000
+++ po/en_GB.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/es.po'
--- po/es.po	2015-01-15 06:05:52 +0000
+++ po/es.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/eu.po'
--- po/eu.po	2015-01-22 06:45:44 +0000
+++ po/eu.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-22 06:45+0000\n"
-"X-Generator: Launchpad (build 17306)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/fa.po'
--- po/fa.po	2015-01-15 06:05:52 +0000
+++ po/fa.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/fi.po'
--- po/fi.po	2015-01-15 06:05:52 +0000
+++ po/fi.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/fr.po'
--- po/fr.po	2015-01-15 06:05:52 +0000
+++ po/fr.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/fr_CA.po'
--- po/fr_CA.po	2015-01-15 06:05:52 +0000
+++ po/fr_CA.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ga.po'
--- po/ga.po	2015-01-15 06:05:52 +0000
+++ po/ga.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/gd.po'
--- po/gd.po	2015-01-15 06:05:52 +0000
+++ po/gd.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 "Language: gd\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170

=== modified file 'po/gl.po'
--- po/gl.po	2015-01-15 06:05:52 +0000
+++ po/gl.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/he.po'
--- po/he.po	2015-01-15 06:05:52 +0000
+++ po/he.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/hr.po'
--- po/hr.po	2015-01-15 06:05:52 +0000
+++ po/hr.po	2015-05-03 15:50:48 +0000
@@ -14,14 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr ""
+msgstr "Nepoznata aplikacija želi pristupiti vašoj trenutnoj lokaciji."
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format
 msgid "%1% wants to access your current location."
-msgstr ""
+msgstr "%1% želi pristupiti vašoj trenutnoj lokaciji."

=== modified file 'po/hu.po'
--- po/hu.po	2015-01-15 06:05:52 +0000
+++ po/hu.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== added file 'po/ia.po'
--- po/ia.po	1970-01-01 00:00:00 +0000
+++ po/ia.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Interlingua translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-04-24 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr "Un application non cognoscite vole acceder a tu localisation actual"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr "%1% vole haber access a tu localisation actual"

=== modified file 'po/id.po'
--- po/id.po	2015-01-15 06:05:52 +0000
+++ po/id.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/is.po'
--- po/is.po	2015-01-15 06:05:52 +0000
+++ po/is.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/it.po'
--- po/it.po	2015-01-15 06:05:52 +0000
+++ po/it.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ja.po'
--- po/ja.po	2015-01-15 06:05:52 +0000
+++ po/ja.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/km.po'
--- po/km.po	2015-01-15 06:05:52 +0000
+++ po/km.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ko.po'
--- po/ko.po	2015-01-15 06:05:52 +0000
+++ po/ko.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== added file 'po/ml.po'
--- po/ml.po	1970-01-01 00:00:00 +0000
+++ po/ml.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Malayalam translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-03-04 05:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malayalam <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr ""
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr ""

=== added file 'po/mr.po'
--- po/mr.po	1970-01-01 00:00:00 +0000
+++ po/mr.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Marathi translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-04-04 04:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Marathi <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr "एक unconfined अॅपलिकेशन आपले वर्तमान स्थान प्रवेश करू इच्छिते."
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr "%1% आपले वर्तमान स्थान प्रवेश करू इच्छिते."

=== modified file 'po/ms.po'
--- po/ms.po	2015-01-15 06:05:52 +0000
+++ po/ms.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/nb.po'
--- po/nb.po	2015-01-15 06:05:52 +0000
+++ po/nb.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/nl.po'
--- po/nl.po	2015-01-15 06:05:52 +0000
+++ po/nl.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== added file 'po/ny.po'
--- po/ny.po	1970-01-01 00:00:00 +0000
+++ po/ny.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Chewa; Chichewa; Nyanja translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-03-09 13:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chewa; Chichewa; Nyanja <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr "Pologalamu yosadziwika ikufuna lowenawo mumalo anu muliwa."
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr "%1% akufuna alowe nawo mumalo omwe muliwa."

=== modified file 'po/oc.po'
--- po/oc.po	2015-01-15 06:05:52 +0000
+++ po/oc.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/pa.po'
--- po/pa.po	2015-01-15 06:05:52 +0000
+++ po/pa.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/pl.po'
--- po/pl.po	2015-01-22 06:45:44 +0000
+++ po/pl.po	2015-05-03 15:50:48 +0000
@@ -14,14 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-22 06:45+0000\n"
-"X-Generator: Launchpad (build 17306)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr ""
+msgstr "Nieograniczony program chce uzyskać dostęp do bieżącej lokalizacji."
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format
 msgid "%1% wants to access your current location."
-msgstr ""
+msgstr "%1% chce uzyskać dostęp do bieżącej lokalizacji."

=== modified file 'po/pt.po'
--- po/pt.po	2015-01-15 06:05:52 +0000
+++ po/pt.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
@@ -24,4 +24,4 @@
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format
 msgid "%1% wants to access your current location."
-msgstr "%1% quer aceder à sua localização actual"
+msgstr "%1% quer aceder à sua localização atual."

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2015-01-15 06:05:52 +0000
+++ po/pt_BR.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ro.po'
--- po/ro.po	2015-01-15 06:05:52 +0000
+++ po/ro.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ru.po'
--- po/ru.po	2015-01-15 06:05:52 +0000
+++ po/ru.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== added file 'po/sk.po'
--- po/sk.po	1970-01-01 00:00:00 +0000
+++ po/sk.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Slovak translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-02-22 06:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr ""
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr ""

=== modified file 'po/sl.po'
--- po/sl.po	2015-01-15 06:05:52 +0000
+++ po/sl.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== added file 'po/sq.po'
--- po/sq.po	1970-01-01 00:00:00 +0000
+++ po/sq.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Albanian translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-03-24 13:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Albanian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr "Një program i panjohur kërkon të gjejë se ku ndodheni tani."
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr "%1% do të gjejë vendndodhjen tuaj të tanishme."

=== modified file 'po/sr.po'
--- po/sr.po	2015-01-15 06:05:52 +0000
+++ po/sr.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/sv.po'
--- po/sv.po	2015-01-15 06:05:52 +0000
+++ po/sv.po	2015-05-03 15:50:48 +0000
@@ -2,24 +2,25 @@
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the location-service package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
+# clone <[e-mail]>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: location-service\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-09-19 01:04+0200\n"
-"PO-Revision-Date: 2014-10-12 10:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <[e-mail]>\n"
+"PO-Revision-Date: 2015-04-03 05:35+0000\n"
+"Last-Translator: Josef Andersson <Unknown>\n"
+"Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+"Language: sv\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr "Ett obevakat program vill komma åt din nuvarande plats."
+msgstr "Ett obegränsat program vill komma åt din nuvarande platsinformation."
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format

=== modified file 'po/ta.po'
--- po/ta.po	2015-01-15 06:05:52 +0000
+++ po/ta.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== added file 'po/tg.po'
--- po/tg.po	1970-01-01 00:00:00 +0000
+++ po/tg.po	2015-05-03 15:50:48 +0000
@@ -0,0 +1,27 @@
+# Tajik translation for location-service
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the location-service package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: location-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2015-03-10 04:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tajik <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr ""
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr ""

=== modified file 'po/th.po'
--- po/th.po	2015-01-15 06:05:52 +0000
+++ po/th.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/tr.po'
--- po/tr.po	2015-01-15 06:05:52 +0000
+++ po/tr.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/ug.po'
--- po/ug.po	2015-01-15 06:05:52 +0000
+++ po/ug.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/uk.po'
--- po/uk.po	2015-01-15 06:05:52 +0000
+++ po/uk.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/vi.po'
--- po/vi.po	2015-02-01 06:35:17 +0000
+++ po/vi.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-01 06:35+0000\n"
-"X-Generator: Launchpad (build 17306)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2015-01-15 06:05:52 +0000
+++ po/zh_CN.po	2015-05-03 15:50:48 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 06:05+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2015-01-31 06:19:34 +0000
+++ po/zh_TW.po	2015-05-03 15:50:48 +0000
@@ -8,20 +8,20 @@
 "Project-Id-Version: location-service\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-09-19 01:04+0200\n"
-"PO-Revision-Date: 2015-01-30 22:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-03-01 10:46+0000\n"
+"Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-31 06:19+0000\n"
-"X-Generator: Launchpad (build 17306)\n"
+"X-Launchpad-Export-Date: 2015-04-25 05:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
 msgid "An unconfined application wants to access your current location."
-msgstr ""
+msgstr "有個尚未設限的程式想要存取您的目前位置。"
 
 #: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
 #, boost-format
 msgid "%1% wants to access your current location."
-msgstr ""
+msgstr "%1% 想存取您的目前位置。"

=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/CMakeLists.txt	2015-01-25 12:45:30 +0000
+++ src/location_service/com/ubuntu/location/CMakeLists.txt	2015-05-03 15:50:48 +0000
@@ -27,6 +27,7 @@
   proxy_provider.cpp
   satellite_based_positioning_state.cpp
   settings.cpp
+  time_based_update_policy.cpp
   set_name_for_thread.cpp
   wifi_and_cell_reporting_state.cpp
 

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-01-06 12:35:02 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-05-03 15:50:48 +0000
@@ -75,8 +75,9 @@
 {
     std::lock_guard<std::mutex> lg(d.cached.guard);
 
-    for (const auto& pair : d.cached.wireless_devices)
-        pair.second.request_scan();
+    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
@@ -506,16 +507,23 @@
         const core::dbus::types::ObjectPath& device_path,
         std::unique_lock<std::mutex>& ul)
 {
-    if (cached.wireless_devices.count(device_path) > 0)
+    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.wireless_devices.insert(std::make_pair(device_path, device));
+        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)
@@ -567,7 +575,7 @@
         const core::dbus::types::ObjectPath& path,
         std::unique_lock<std::mutex>&)
 {
-    cached.wireless_devices.erase(path);
+    cached.nm_devices.erase(path);
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_access_point_added(
@@ -577,8 +585,8 @@
 {
     // 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.wireless_devices.find(device_path);
-    if (itd == cached.wireless_devices.end())
+    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
@@ -638,8 +646,8 @@
                 // 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.wireless_devices.count(path) > 0)
-                    type = cached.wireless_devices.at(path).type();                
+                if (cached.nm_devices.count(path) > 0 )
+                    type = cached.nm_devices.at(path).type();
             }
 
             // We interpret a primary connection over a modem device as
@@ -672,7 +680,7 @@
                     }
                 }
 
-                characteristics = characteristics | all_characteristics();
+                characteristics = characteristics | all_characteristics();                
             } else if (type == xdg::NetworkManager::Device::Type::wifi)
             {
                 characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wifi;
@@ -684,6 +692,7 @@
         // Empty on purpose.
     }
 
+    LOG(INFO) << characteristics << std::endl;
     return characteristics;
 }
 
@@ -705,7 +714,24 @@
 
         worker_thread = std::move(std::thread
         {
-            [this]() { system_bus->run(); }
+            [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.";
+                    }
+                }
+            }
         });
     }
 

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2014-11-10 20:12:56 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2015-05-03 15:50:48 +0000
@@ -126,7 +126,25 @@
             // And a dedicated worker thread.
             std::thread worker
             {
-                [this]() { service.run(); }
+                [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;
 
@@ -144,7 +162,7 @@
             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> wireless_devices;
+            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;

=== modified file 'src/location_service/com/ubuntu/location/engine.cpp'
--- src/location_service/com/ubuntu/location/engine.cpp	2015-01-25 12:44:20 +0000
+++ src/location_service/com/ubuntu/location/engine.cpp	2015-05-03 15:50:48 +0000
@@ -24,6 +24,8 @@
 #include <stdexcept>
 #include <unordered_map>
 
+#include "time_based_update_policy.h"
+
 namespace cul = com::ubuntu::location;
 
 const cul::SatelliteBasedPositioningState cul::Engine::Configuration::Defaults::satellite_based_positioning_state;
@@ -33,7 +35,8 @@
 cul::Engine::Engine(const cul::ProviderSelectionPolicy::Ptr& provider_selection_policy,
                     const cul::Settings::Ptr& settings)
           : provider_selection_policy(provider_selection_policy),
-            settings(settings)
+            settings(settings),
+            update_policy(std::make_shared<cul::TimeBasedUpdatePolicy>())
 {
     if (!provider_selection_policy) throw std::runtime_error
     {
@@ -204,7 +207,7 @@
     // We should come up with a better heuristic here.
     auto cpr = provider->updates().position.connect([this](const cul::Update<cul::Position>& src)
     {
-        updates.reference_location = src;
+        updates.reference_location = update_policy->verify_update(src);
     });
 
     std::lock_guard<std::mutex> lg(guard);

=== modified file 'src/location_service/com/ubuntu/location/engine.h'
--- src/location_service/com/ubuntu/location/engine.h	2015-01-14 13:41:54 +0000
+++ src/location_service/com/ubuntu/location/engine.h	2015-05-03 15:50:48 +0000
@@ -33,6 +33,8 @@
 #include <mutex>
 #include <set>
 
+#include "update_policy.h"
+
 namespace com
 {
 namespace ubuntu
@@ -193,6 +195,7 @@
     std::map<Provider::Ptr, ProviderConnections> providers;
     ProviderSelectionPolicy::Ptr provider_selection_policy;
     Settings::Ptr settings;
+    UpdatePolicy::Ptr update_policy;
 };
 
 /** @brief Pretty prints the given status to the given stream. */

=== renamed file 'include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h' => 'src/location_service/com/ubuntu/location/providers/geoclue/geoclue.h'
=== modified file 'src/location_service/com/ubuntu/location/providers/geoclue/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/geoclue/provider.cpp	2014-02-03 13:52:21 +0000
+++ src/location_service/com/ubuntu/location/providers/geoclue/provider.cpp	2015-05-03 15:50:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2013 Canonical Ltd.
+ * Copyright © 2012-2015 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,
@@ -14,18 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Manuel de la Pena <[e-mail]>
  */
-#include <com/ubuntu/location/providers/geoclue/provider.h>
-
-#include <com/ubuntu/location/providers/geoclue/geoclue.h>
-
-#include <core/dbus/object.h>
-#include <core/dbus/signal.h>
-
-#include "core/dbus/object.h"
-#include "core/dbus/signal.h"
-
-#include <thread>
+
+#include "provider.h"
 
 namespace cul = com::ubuntu::location;
 namespace culpg = com::ubuntu::location::providers::geoclue;
@@ -41,128 +33,103 @@
 }
 }
 
-struct culpg::Provider::Private
-{
-    typedef dbus::Signal<
-        org::freedesktop::Geoclue::Position::Signals::PositionChanged,
-        org::freedesktop::Geoclue::Position::Signals::PositionChanged::ArgumentType
-    > PositionChanged;
-
-    typedef dbus::Signal<
-        org::freedesktop::Geoclue::Velocity::Signals::VelocityChanged,
-        org::freedesktop::Geoclue::Velocity::Signals::VelocityChanged::ArgumentType
-    > VelocityChanged;
-
-    Private(const culpg::Provider::Configuration& config) 
-            : bus(the_session_bus()),
-              service(dbus::Service::use_service(bus, config.name)),
-              object(service->object_for_path(config.path)),
-              signal_position_changed(object->get_signal<org::freedesktop::Geoclue::Position::Signals::PositionChanged>()),
-              signal_velocity_changed(object->get_signal<org::freedesktop::Geoclue::Velocity::Signals::VelocityChanged>())  
-    {        
-    }
-    
-    void start() 
-    { 
-        if (!worker.joinable()) 
-            worker = std::move(std::thread{std::bind(&dbus::Bus::run, bus)});
-    }
-
-    void stop() 
-    { 
-        bus->stop();
-        if (worker.joinable())
-            worker.join();
-    }
-
-    dbus::Bus::Ptr bus;
-    dbus::Service::Ptr service;
-    dbus::Object::Ptr object;
-    PositionChanged::Ptr signal_position_changed;
-    VelocityChanged::Ptr signal_velocity_changed;
-    PositionChanged::SubscriptionToken position_updates_connection;
-    VelocityChanged::SubscriptionToken velocity_updates_connection;
-
-    std::thread worker;
-};
+void culpg::Provider::start()
+{
+    if (!worker.joinable())
+        worker = std::move(std::thread{std::bind(&dbus::Bus::run, bus)});
+}
+
+void culpg::Provider::stop()
+{
+    bus->stop();
+    if (worker.joinable())
+        worker.join();
+}
+
+void culpg::Provider::on_position_changed(const fd::Geoclue::Position::Signals::PositionChanged::ArgumentType& arg)
+{
+    fd::Geoclue::Position::FieldFlags flags{static_cast<unsigned long>(std::get<0>(arg))};
+    cul::Position pos
+    {
+        flags.test(fd::Geoclue::Position::Field::latitude) ?
+            cul::wgs84::Latitude{std::get<2>(arg)* cul::units::Degrees} : cul::wgs84::Latitude{},
+        flags.test(fd::Geoclue::Position::Field::longitude) ?
+            cul::wgs84::Longitude{std::get<3>(arg)* cul::units::Degrees} : cul::wgs84::Longitude{}
+    };
+
+    if (flags.test(fd::Geoclue::Position::Field::altitude))
+        pos.altitude = cul::wgs84::Altitude{std::get<4>(arg)* cul::units::Meters};
+
+    cul::Update<cul::Position> update(pos);
+    mutable_updates().position(update);
+}
+
+void culpg::Provider::on_velocity_changed(const fd::Geoclue::Velocity::Signals::VelocityChanged::ArgumentType& arg)
+{
+    fd::Geoclue::Velocity::FieldFlags flags{static_cast<unsigned long>(std::get<0>(arg))};
+    if (flags.none())
+        return;
+    if (flags.test(fd::Geoclue::Velocity::Field::speed))
+    {
+        cul::Update<cul::Velocity> update
+        {
+            std::get<2>(arg) * cul::units::MetersPerSecond,
+            cul::Clock::now()
+        };
+        mutable_updates().velocity(update);
+    }
+
+    if (flags.test(fd::Geoclue::Velocity::Field::direction))
+    {
+        cul::Update<cul::Heading> update
+        {
+            std::get<3>(arg) * cul::units::Degrees,
+            cul::Clock::now()
+        };
+
+        mutable_updates().heading(update);
+    }
+}
 
 cul::Provider::Ptr culpg::Provider::create_instance(const cul::ProviderFactory::Configuration& config)
 {
     culpg::Provider::Configuration pConfig;
-    pConfig.name = config.count(Configuration::key_name()) > 0 ? config.get<std::string>(Configuration::key_name()) : throw std::runtime_error("Missing bus-name");
-    pConfig.path = config.count(Configuration::key_path()) > 0 ? config.get<std::string>(Configuration::key_path()) : throw std::runtime_error("Missing bus-path");
+    pConfig.name = config.count(Configuration::key_name()) > 0 ?
+                   config.get<std::string>(Configuration::key_name()) : throw std::runtime_error("Missing bus-name");
+    pConfig.path = config.count(Configuration::key_path()) > 0 ?
+                   config.get<std::string>(Configuration::key_path()) : throw std::runtime_error("Missing bus-path");
     return cul::Provider::Ptr{new culpg::Provider{pConfig}};
 }
 
 culpg::Provider::Provider(const culpg::Provider::Configuration& config) 
         : com::ubuntu::location::Provider(config.features, config.requirements),
-          d(new Private(config))
+          bus(the_session_bus()),
+          service(dbus::Service::use_service(bus, config.name)),
+          object(service->object_for_path(config.path)),
+          signal_position_changed(object->get_signal<fd::Geoclue::Position::Signals::PositionChanged>()),
+          signal_velocity_changed(object->get_signal<fd::Geoclue::Velocity::Signals::VelocityChanged>())
 {
-    d->position_updates_connection = 
-            d->signal_position_changed->connect(
-                [this](const org::freedesktop::Geoclue::Position::Signals::PositionChanged::ArgumentType& arg)
-                {
-                    org::freedesktop::Geoclue::Position::FieldFlags flags{static_cast<unsigned long>(std::get<0>(arg))};
-                    cul::Position pos
-                    {
-                        flags.test(org::freedesktop::Geoclue::Position::Field::latitude) ?
-                                cul::wgs84::Latitude{std::get<2>(arg)* cul::units::Degrees} : cul::wgs84::Latitude{},
-                        flags.test(org::freedesktop::Geoclue::Position::Field::longitude) ?
-                                cul::wgs84::Longitude{std::get<3>(arg)* cul::units::Degrees} : cul::wgs84::Longitude{}
-                    };
-
-                    if (flags.test(org::freedesktop::Geoclue::Position::Field::altitude))
-                        pos.altitude = cul::wgs84::Altitude{std::get<4>(arg)* cul::units::Meters};
-
-                    cul::Update<cul::Position> update(pos);
-                    this->mutable_updates().position(update);
-                });
-
-    d->velocity_updates_connection = 
-            d->signal_velocity_changed->connect(
-                [this](const org::freedesktop::Geoclue::Velocity::Signals::VelocityChanged::ArgumentType& arg)
-                {
-                    org::freedesktop::Geoclue::Velocity::FieldFlags flags{static_cast<unsigned long>(std::get<0>(arg))};
-                    if (flags.none())
-                        return;
-                    if (flags.test(org::freedesktop::Geoclue::Velocity::Field::speed))
-                    {
-                        cul::Update<cul::Velocity> update
-                        {
-                            std::get<2>(arg) * cul::units::MetersPerSecond,
-                            cul::Clock::now()
-                        };
-                        this->mutable_updates().velocity(update);
-                    }
-
-                    if (flags.test(org::freedesktop::Geoclue::Velocity::Field::direction))
-                    {
-                        cul::Update<cul::Heading> update
-                        {
-                            std::get<3>(arg) * cul::units::Degrees,
-                            cul::Clock::now()
-                        };
-                            
-                        this->mutable_updates().heading(update);
-                    }
-                });
-
-    auto info = d->object->invoke_method_synchronously<
-        org::freedesktop::Geoclue::GetProviderInfo, 
-        org::freedesktop::Geoclue::GetProviderInfo::ResultType>();
-    auto status = d->object->invoke_method_synchronously<
-        org::freedesktop::Geoclue::GetStatus, 
-        org::freedesktop::Geoclue::GetStatus::ResultType>();
+    position_updates_connection = signal_position_changed->connect(
+            std::bind(&culpg::Provider::on_position_changed, this, std::placeholders::_1));
+    velocity_updates_connection = signal_velocity_changed->connect(
+            std::bind(&culpg::Provider::on_velocity_changed, this, std::placeholders::_1));
+
+    auto info = object->invoke_method_synchronously<
+        fd::Geoclue::GetProviderInfo,
+        fd::Geoclue::GetProviderInfo::ResultType>();
+    auto status = object->invoke_method_synchronously<
+        fd::Geoclue::GetStatus,
+        fd::Geoclue::GetStatus::ResultType>();
         
     std::cout << "GeoclueProvider: [" 
               << std::get<0>(info.value()) << ", " 
               << std::get<1>(info.value()) << ","
-              << static_cast<org::freedesktop::Geoclue::Status>(status.value()) << "]" <<std::endl;
+              << static_cast<fd::Geoclue::Status>(status.value()) << "]" <<std::endl;
 }
 
 culpg::Provider::~Provider() noexcept
 {
-    d->stop();
+    stop();
 }
 
 bool culpg::Provider::matches_criteria(const cul::Criteria&)
@@ -172,30 +139,30 @@
 
 void culpg::Provider::start_position_updates()
 {
-    d->start();
+    start();
 }
 
 void culpg::Provider::stop_position_updates()
 {
-    d->stop();
+    stop();
 }
 
 void culpg::Provider::start_velocity_updates()
 {
-    d->start();
+    start();
 }
 
 void culpg::Provider::stop_velocity_updates()
 {
-    d->stop();
+    stop();
 }    
 
 void culpg::Provider::start_heading_updates()
 {
-    d->start();
+    start();
 }
 
 void culpg::Provider::stop_heading_updates()
 {
-    d->stop();
+    stop();
 }    

=== renamed file 'include/location_service/com/ubuntu/location/providers/geoclue/provider.h' => 'src/location_service/com/ubuntu/location/providers/geoclue/provider.h'
--- include/location_service/com/ubuntu/location/providers/geoclue/provider.h	2013-12-10 09:42:54 +0000
+++ src/location_service/com/ubuntu/location/providers/geoclue/provider.h	2015-05-03 15:50:48 +0000
@@ -14,13 +14,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Manuel de la Pena <[e-mail]>
  */
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_
 
+#include <core/dbus/object.h>
+#include <core/dbus/signal.h>
+
+#include "core/dbus/object.h"
+#include "core/dbus/signal.h"
+
 #include <com/ubuntu/location/provider.h>
 #include <com/ubuntu/location/provider_factory.h>
 
+#include <thread>
+
+#include "geoclue.h"
+
+namespace fd = org::freedesktop;
+
 namespace com
 {
 namespace ubuntu
@@ -33,6 +46,17 @@
 {
 class Provider : public com::ubuntu::location::Provider
 {
+
+  typedef dbus::Signal<
+      fd::Geoclue::Position::Signals::PositionChanged,
+      fd::Geoclue::Position::Signals::PositionChanged::ArgumentType
+  > PositionChanged;
+
+  typedef dbus::Signal<
+      fd::Geoclue::Velocity::Signals::VelocityChanged,
+      fd::Geoclue::Velocity::Signals::VelocityChanged::ArgumentType
+  > VelocityChanged;
+
   public:
     static Provider::Ptr create_instance(const ProviderFactory::Configuration&);
 
@@ -52,18 +76,32 @@
 
     virtual bool matches_criteria(const Criteria&);
 
-    virtual void start_position_updates();
-    virtual void stop_position_updates();
-
-    virtual void start_velocity_updates();
-    virtual void stop_velocity_updates();
-
-    virtual void start_heading_updates();
-    virtual void stop_heading_updates();
-
-  private:
-    struct Private;
-    std::unique_ptr<Private> d;
+    virtual void start_position_updates() override;
+    virtual void stop_position_updates() override;
+
+    virtual void start_velocity_updates() override;
+    virtual void stop_velocity_updates() override;
+
+    virtual void start_heading_updates() override;
+    virtual void stop_heading_updates() override;
+
+  private:
+    void start();
+    void stop();
+
+    void on_position_changed(const fd::Geoclue::Position::Signals::PositionChanged::ArgumentType& arg);
+    void on_velocity_changed(const fd::Geoclue::Velocity::Signals::VelocityChanged::ArgumentType& arg);
+
+  private:
+    dbus::Bus::Ptr bus;
+    dbus::Service::Ptr service;
+    dbus::Object::Ptr object;
+    PositionChanged::Ptr signal_position_changed;
+    VelocityChanged::Ptr signal_velocity_changed;
+    PositionChanged::SubscriptionToken position_updates_connection;
+    VelocityChanged::SubscriptionToken velocity_updates_connection;
+
+    std::thread worker;
 };
 }
 }

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2014-06-23 07:47:27 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2015-05-03 15:50:48 +0000
@@ -49,7 +49,7 @@
         /** @brief Timeout on gps xtra download operations. */
         std::chrono::milliseconds timeout
         {
-            1500
+            5000
         };
 
         /** Set of hosts serving GPS xtra data. */

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/provider.cpp	2014-10-27 21:58:16 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/provider.cpp	2015-05-03 15:50:48 +0000
@@ -28,11 +28,6 @@
 namespace cul = com::ubuntu::location;
 namespace culg = com::ubuntu::location::providers::gps;
 
-struct culg::Provider::Private
-{
-    std::shared_ptr<HardwareAbstractionLayer> hal;
-};
-
 std::string culg::Provider::class_name()
 {
     return "gps::Provider";
@@ -47,26 +42,25 @@
     : cul::Provider(
           cul::Provider::Features::position | cul::Provider::Features::velocity | cul::Provider::Features::heading,
           cul::Provider::Requirements::satellites),
-      d(new Private())
+          hal(hal)
 {
-    d->hal = hal;
 
-    d->hal->position_updates().connect([this](const location::Position& pos)
+    hal->position_updates().connect([this](const location::Position& pos)
     {
         mutable_updates().position(Update<Position>(pos));
     });
 
-    d->hal->heading_updates().connect([this](const location::Heading& heading)
+    hal->heading_updates().connect([this](const location::Heading& heading)
     {
         mutable_updates().heading(Update<Heading>(heading));
     });
 
-    d->hal->velocity_updates().connect([this](const location::Velocity& velocity)
+    hal->velocity_updates().connect([this](const location::Velocity& velocity)
     {
         mutable_updates().velocity(Update<Velocity>(velocity));
     });
 
-    d->hal->space_vehicle_updates().connect([this](const std::set<location::SpaceVehicle>& svs)
+    hal->space_vehicle_updates().connect([this](const std::set<location::SpaceVehicle>& svs)
     {
         mutable_updates().svs(Update<std::set<location::SpaceVehicle>>(svs));
     });
@@ -83,12 +77,12 @@
 
 void culg::Provider::start_position_updates()
 {
-    d->hal->start_positioning();
+    hal->start_positioning();
 }
 
 void culg::Provider::stop_position_updates()
 {
-    d->hal->stop_positioning();
+    hal->stop_positioning();
 }
 
 void culg::Provider::start_velocity_updates()
@@ -109,6 +103,6 @@
 
 void culg::Provider::on_reference_location_updated(const cul::Update<cul::Position>& position)
 {
-    d->hal->inject_reference_position(position.value);
+    hal->inject_reference_position(position.value);
 }
 

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/provider.h'
--- src/location_service/com/ubuntu/location/providers/gps/provider.h	2014-01-20 13:03:19 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/provider.h	2015-05-03 15:50:48 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Manuel de la Pena <[e-mail]>
  */
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_PROVIDER_H_
@@ -60,8 +61,7 @@
     void on_reference_location_updated(const Update<Position>& position);
 
   private:
-    struct Private;
-    std::unique_ptr<Private> d;    
+    std::shared_ptr<HardwareAbstractionLayer> hal;
 };
 }
 }

=== modified file 'src/location_service/com/ubuntu/location/providers/remote/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2015-01-26 19:13:52 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2015-05-03 15:50:48 +0000
@@ -66,6 +66,7 @@
             try
             {
                 service.run();
+                break;  // provider has exited correctly
             }
             catch (const std::exception& e)
             {

=== modified file 'src/location_service/com/ubuntu/location/providers/skyhook/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/skyhook/provider.cpp	2013-12-10 09:42:54 +0000
+++ src/location_service/com/ubuntu/location/providers/skyhook/provider.cpp	2015-05-03 15:50:48 +0000
@@ -53,71 +53,6 @@
 };
 }
 
-struct culs::Provider::Private
-{
-    enum class State
-    {
-        stopped,
-        started,
-        stop_requested
-    };
-
-    static WPS_Continuation periodic_callback(
-        void* context,
-        WPS_ReturnCode code,
-        const WPS_Location* location,
-        const void*);
-    
-    Private(
-        const culs::Provider::Configuration& config, 
-        culs::Provider* parent)
-            : parent(parent),
-              config(config),
-              state(State::stopped)
-    {
-    }
-    
-    void start()
-    {
-        if (state != State::stopped)
-            return;
-        
-        if (worker.joinable())
-            worker.join();
-
-        static const unsigned infinite_iterations = 0;
-        
-        authentication.username = config.user_name.c_str();
-        authentication.realm = config.realm.c_str();
-        
-        worker = std::move(std::thread([&]()
-        {
-            int rc = WPS_periodic_location(
-                &authentication,
-                WPS_NO_STREET_ADDRESS_LOOKUP,
-                config.period.count(),
-                infinite_iterations,
-                culs::Provider::Private::periodic_callback,
-                this);
-
-            if (rc != WPS_OK)
-                LOG(ERROR) << return_code_lut.at(rc);
-        }));
-
-        state = State::started;
-    }
-    
-    void request_stop()
-    {
-        state = State::stop_requested;
-    }
-
-    culs::Provider* parent;
-    Configuration config;
-    State state;
-    WPS_SimpleAuthentication authentication;
-    std::thread worker;
-};
 
 WPS_Continuation culs::Provider::Private::periodic_callback(void* context,
                                                             WPS_ReturnCode code,
@@ -195,13 +130,44 @@
 
 culs::Provider::Provider(const culs::Provider::Configuration& config) 
         : com::ubuntu::location::Provider(culs::Provider::default_feature_flags(), culs::Provider::default_requirement_flags()),
-          d(new Private(config, this))
+          config(config),
+          state(State::stopped)
 {
 }
 
 culs::Provider::~Provider() noexcept
 {
-    d->request_stop();
+    request_stop();
+}
+
+void culs::Provider::start()
+{
+    if (state != State::stopped)
+        return;
+
+    if (worker.joinable())
+        worker.join();
+
+    static const unsigned infinite_iterations = 0;
+
+    authentication.username = config.user_name.c_str();
+    authentication.realm = config.realm.c_str();
+
+    worker = std::move(std::thread([&]()
+    {
+        int rc = WPS_periodic_location(&authentication, WPS_NO_STREET_ADDRESS_LOOKUP, config.period.count(),
+                                       infinite_iterations, culs::Provider::Private::periodic_callback, this);
+
+        if (rc != WPS_OK)
+            LOG(ERROR) << return_code_lut.at(rc);
+    }));
+
+    state = State::started;
+}
+
+void culs::Provider::request_stop()
+{
+    state = State::stop_requested;
 }
 
 bool culs::Provider::matches_criteria(const cul::Criteria&)
@@ -211,30 +177,30 @@
 
 void culs::Provider::start_position_updates()
 {
-    d->start();
+    start();
 }
 
 void culs::Provider::stop_position_updates()
 {
-    d->request_stop();
+    request_stop();
 }
 
 void culs::Provider::start_velocity_updates()
 {
-    d->start();
+    start();
 }
 
 void culs::Provider::stop_velocity_updates()
 {
-    d->request_stop();
+    request_stop();
 }    
 
 void culs::Provider::start_heading_updates()
 {
-    d->start();
+    start();
 }
 
 void culs::Provider::stop_heading_updates()
 {
-    d->request_stop();
+    request_stop();
 }

=== renamed file 'include/location_service/com/ubuntu/location/providers/skyhook/provider.h' => 'src/location_service/com/ubuntu/location/providers/skyhook/provider.h'
--- include/location_service/com/ubuntu/location/providers/skyhook/provider.h	2013-12-10 09:42:54 +0000
+++ src/location_service/com/ubuntu/location/providers/skyhook/provider.h	2015-05-03 15:50:48 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Manuel de la Pena <[e-mail]>
  */
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_SKYHOOK_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_SKYHOOK_PROVIDER_H_
@@ -35,6 +36,13 @@
 {
 class Provider : public com::ubuntu::location::Provider
 {
+    enum class State
+    {
+        stopped,
+        started,
+        stop_requested
+    };
+
   public:
     static Provider::Ptr create_instance(const ProviderFactory::Configuration& config);
     
@@ -57,20 +65,33 @@
     Provider& operator=(const Provider&) = delete;
     ~Provider() noexcept;
 
-    virtual bool matches_criteria(const Criteria&);
-
-    virtual void start_position_updates();
-    virtual void stop_position_updates();
-
-    virtual void start_velocity_updates();
-    virtual void stop_velocity_updates();
-
-    virtual void start_heading_updates();
-    virtual void stop_heading_updates();
+    virtual bool matches_criteria(const Criteria&) override;
+
+    virtual void start_position_updates() override;
+    virtual void stop_position_updates() override;
+
+    virtual void start_velocity_updates() override;
+    virtual void stop_velocity_updates() override;
+
+    virtual void start_heading_updates() override;
+    virtual void stop_heading_updates() override;
+
+ private:
+    static WPS_Continuation periodic_callback(
+            void* context,
+            WPS_ReturnCode code,
+            const WPS_Location* location,
+            const void*);
+
+    void start();
+    void stop();
 
   private:
-    struct Private;
-    std::unique_ptr<Private> d;
+
+    Configuration config;
+    State state;
+    WPS_SimpleAuthentication authentication;
+    std::thread worker;
 };
 }
 }

=== modified file 'src/location_service/com/ubuntu/location/service/daemon.cpp'
--- src/location_service/com/ubuntu/location/service/daemon.cpp	2015-02-13 13:19:18 +0000
+++ src/location_service/com/ubuntu/location/service/daemon.cpp	2015-05-03 15:50:48 +0000
@@ -15,6 +15,8 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
+
+#include <com/ubuntu/location/logging.h>
 #include <com/ubuntu/location/boost_ptree_settings.h>
 #include <com/ubuntu/location/provider_factory.h>
 
@@ -239,11 +241,32 @@
     };
 
     auto location_service = std::make_shared<location::service::Implementation>(configuration);
+    // We need to ensure that any exception raised by the executor does not crash the app
+    // and also gets logged.
+    auto execute = [] (std::shared_ptr<core::dbus::Bus> bus) {
+        while(true)
+        {
+            try
+            {
+                VLOG(10) << "Starting a bus executor";
+                bus->run();
+                break; // run() exited normally
+            }
+            catch (const std::exception& e)
+            {
+                LOG(WARNING) << e.what();
+            }
+            catch (...)
+            {
+                LOG(WARNING) << "Unexpected exception was raised by the bus executor";
+            }
+        }
+    };
 
-    std::thread t1{[&config](){config.incoming->run();}};
-    std::thread t2{[&config](){config.incoming->run();}};
-    std::thread t3{[&config](){config.incoming->run();}};
-    std::thread t4{[&config](){config.outgoing->run();}};
+    std::thread t1{execute, config.incoming};
+    std::thread t2{execute, config.incoming};
+    std::thread t3{execute, config.incoming};
+    std::thread t4{execute, config.outgoing};
 
     trap->run();
 

=== added file 'src/location_service/com/ubuntu/location/time_based_update_policy.cpp'
--- src/location_service/com/ubuntu/location/time_based_update_policy.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/time_based_update_policy.cpp	2015-05-03 15:50:48 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2015 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: Manuel de la Pena <[e-mail]>
+ */
+
+#include "time_based_update_policy.h"
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+
+std::chrono::minutes TimeBasedUpdatePolicy::default_timeout()
+{
+    static const std::chrono::minutes default_limit(2);
+    return default_limit;
+}
+
+TimeBasedUpdatePolicy::TimeBasedUpdatePolicy(std::chrono::minutes mins)
+    : limit(mins)
+{
+
+}
+
+const location::Update<location::Position>& TimeBasedUpdatePolicy::verify_update(const location::Update<location::Position>& update)
+{
+    std::lock_guard<std::mutex> guard(position_update_mutex);
+    bool use_new_update;
+    if (is_significantly_newer(last_position_update, update, limit))
+    {
+        use_new_update = true;
+    }
+    else if (is_significantly_older(last_position_update, update, limit))
+    {
+        use_new_update = false;
+    }
+    else
+    {
+        // if the update has happened within a reasonable amount of time we will just use it if it is more accurate
+        // that the previous one.
+        use_new_update = last_position_update.value.accuracy.horizontal && update.value.accuracy.horizontal
+            && *last_position_update.value.accuracy.horizontal >= *update.value.accuracy.horizontal;
+    }
+
+    if (use_new_update)
+    {
+        last_position_update = update;
+        return update;
+    }
+    else
+    {
+        return last_position_update;
+    }
+}
+
+
+const location::Update<location::Heading>& TimeBasedUpdatePolicy::verify_update(const location::Update<location::Heading>& update)
+{
+    std::lock_guard<std::mutex> guard(heading_update_mutex);
+    bool use_new_update;
+    if (is_significantly_newer(last_heading_update, update, limit))
+    {
+        use_new_update = true;
+    }
+    else if (is_significantly_older(last_heading_update, update, limit))
+    {
+        use_new_update = false;
+    }
+    if (use_new_update)
+    {
+        last_heading_update = update;
+        return update;
+    }
+    else
+    {
+        return last_heading_update;
+    }
+}
+
+const location::Update<location::Velocity>& TimeBasedUpdatePolicy::verify_update(const location::Update<location::Velocity>& update)
+{
+    std::lock_guard<std::mutex> guard(velocity_update_mutex);
+    bool use_new_update;
+    if (is_significantly_newer(last_velocity_update, update, limit))
+    {
+        use_new_update = true;
+    }
+    else if (is_significantly_older(last_velocity_update, update, limit))
+    {
+        use_new_update = false;
+    }
+
+    if (use_new_update)
+    {
+        last_velocity_update = update;
+        return update;
+    }
+    else
+    {
+        return last_velocity_update;
+    }
+}
+
+}
+}
+}
\ No newline at end of file

=== added file 'src/location_service/com/ubuntu/location/time_based_update_policy.h'
--- src/location_service/com/ubuntu/location/time_based_update_policy.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/time_based_update_policy.h	2015-05-03 15:50:48 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2015 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: Manuel de la Pena <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_TIMES_BASED_UPDATE_POLICY_H_
+#define LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_TIMES_BASED_UPDATE_POLICY_H_
+
+#include <chrono>
+#include <mutex>
+
+#include "update_policy.h"
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+
+// An interface that can be implemented to add heuristics on how heading, position or velocity updates will be chosen.
+// This class ensures that the best update possible is chosen within a reasonable time bracket.
+class TimeBasedUpdatePolicy : public UpdatePolicy {
+
+ public:
+    TimeBasedUpdatePolicy(std::chrono::minutes mins=default_timeout());
+    TimeBasedUpdatePolicy(const TimeBasedUpdatePolicy&) = delete;
+    ~TimeBasedUpdatePolicy() = default;
+
+    // Return if the given position update will be verified as the new position in the engine.
+    const location::Update<location::Position>& verify_update(const location::Update<location::Position>& update) override;
+    // Return if the given heading update will be verified as the new heading in the engine.
+    const location::Update<location::Heading>& verify_update(const location::Update<location::Heading>& update) override;
+    // Return if the given velocity update will be verified as the new velocity in the engine.
+    const location::Update<location::Velocity>& verify_update(const location::Update<location::Velocity>& update) override;
+
+    static std::chrono::minutes default_timeout();
+
+ protected:
+    // not private to simplify the testing but should be private
+    location::Update<location::Position> last_position_update;
+    location::Update<location::Heading> last_heading_update;
+    location::Update<location::Velocity> last_velocity_update;
+
+ private:
+    // callbacks can happen in diff threads, make sure multi-threading will work in this class
+    std::mutex position_update_mutex;
+    std::mutex heading_update_mutex;
+    std::mutex velocity_update_mutex;
+    // used to calculate the time accepted bracket
+    std::chrono::minutes limit;
+};
+
+}
+}
+}
+
+#endif //LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_TIMES_BASED_UPDATE_POLICY_H_

=== added file 'src/location_service/com/ubuntu/location/update_policy.h'
--- src/location_service/com/ubuntu/location/update_policy.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/update_policy.h	2015-05-03 15:50:48 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2015 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: Manuel de la Pena <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_UPDATE_POLICY_H_
+#define LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_UPDATE_POLICY_H_
+
+#include <memory>
+
+#include <com/ubuntu/location/heading.h>
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/update.h>
+#include <com/ubuntu/location/velocity.h>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+
+// An interface that can be implemented to add heuristics on how heading, position or velocity updateswill be chosen.
+// This class allows developers to inject different heuristics in the engine to perform the update selection
+// so that the app developers can take advantage of it.
+class UpdatePolicy {
+ public:
+    typedef std::shared_ptr<UpdatePolicy> Ptr;
+
+    UpdatePolicy(const UpdatePolicy&) = delete;
+    UpdatePolicy(UpdatePolicy&&) = delete;
+    UpdatePolicy& operator=(const UpdatePolicy&) = delete;
+    virtual ~UpdatePolicy() = default;
+
+    // Return if the given position update will be verified as the new position in the engine.
+    virtual const location::Update<location::Position>& verify_update(const location::Update<location::Position>& update) = 0;
+    // Return if the given heading update will be verified as the new heading in the engine.
+    virtual const location::Update<location::Heading>& verify_update(const location::Update<location::Heading>& update) = 0;
+    // Return if the given velocity update will be verified as the new velocity in the engine.
+    virtual const location::Update<location::Velocity>& verify_update(const location::Update<location::Velocity>& update) = 0;
+ protected:
+    UpdatePolicy() = default;
+
+    template <class T> bool is_significantly_newer(const location::Update<T> last_update, const location::Update<T> update, std::chrono::minutes limit) const
+    {
+       auto delta = update.when - last_update.when;
+       return delta > limit;
+    }
+
+    template <class T> bool is_significantly_older(const location::Update<T> last_update, const location::Update<T> update, std::chrono::minutes limit) const
+    {
+       auto delta = update.when - last_update.when;
+       return delta < (-1 * limit);
+    }
+
+
+};
+}
+}
+}
+
+#endif // LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_UPDATE_POLICY_H_
+

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-11-14 11:26:45 +0000
+++ tests/CMakeLists.txt	2015-05-03 15:50:48 +0000
@@ -80,6 +80,7 @@
 LOCATION_SERVICE_ADD_TEST(engine_test engine_test.cpp)
 LOCATION_SERVICE_ADD_TEST(harvester_test harvester_test.cpp)
 LOCATION_SERVICE_ADD_TEST(demultiplexing_reporter_test demultiplexing_reporter_test.cpp)
+LOCATION_SERVICE_ADD_TEST(time_based_update_policy_test time_based_update_policy_test.cpp)
 
 if (NET_CPP_FOUND)
   LOCATION_SERVICE_ADD_TEST(ichnaea_reporter_test ichnaea_reporter_test.cpp)

=== added file 'tests/time_based_update_policy_test.cpp'
--- tests/time_based_update_policy_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/time_based_update_policy_test.cpp	2015-05-03 15:50:48 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright © 2015 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: Manuel de la Pena <[e-mail]>
+ */
+#include <com/ubuntu/location/time_based_update_policy.h>
+
+#include <gtest/gtest.h>
+
+using namespace ::testing;
+namespace cul = com::ubuntu::location;
+
+namespace
+{
+    auto timestamp = com::ubuntu::location::Clock::now();
+
+    com::ubuntu::location::Update<com::ubuntu::location::Position> reference_position_update
+            {
+                    {
+                            com::ubuntu::location::wgs84::Latitude{9. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Longitude{53. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Altitude{-2. * com::ubuntu::location::units::Meters},
+                    },
+                    timestamp
+            };
+}
+
+// make certain internal details public so that we can set the last update
+class PublicTimeBasedUpdatePolicy : public cul::TimeBasedUpdatePolicy {
+ public:
+    PublicTimeBasedUpdatePolicy(std::chrono::minutes mins) :  cul::TimeBasedUpdatePolicy(mins) {}
+    using cul::TimeBasedUpdatePolicy::last_position_update;
+    using cul::TimeBasedUpdatePolicy::last_heading_update;
+    using cul::TimeBasedUpdatePolicy::last_velocity_update;
+};
+
+TEST(TimeBasedUpdatePolicy, policy_ignores_updates_that_are_too_old)
+{
+    auto policy = std::make_shared<PublicTimeBasedUpdatePolicy>(std::chrono::minutes(2));
+    policy->last_position_update = reference_position_update;
+
+    com::ubuntu::location::Update<com::ubuntu::location::Position> old_update
+            {
+                    {
+                            com::ubuntu::location::wgs84::Latitude{10. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Longitude{60. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Altitude{10. * com::ubuntu::location::units::Meters}
+                    },
+                    timestamp - std::chrono::minutes(5)
+            };
+    policy->verify_update(old_update);
+
+    ASSERT_NE(policy->last_position_update.value.latitude, old_update.value.latitude);
+    ASSERT_EQ(policy->last_position_update.value.latitude, reference_position_update.value.latitude);
+
+    ASSERT_NE(policy->last_position_update.value.longitude, old_update.value.longitude);
+    ASSERT_EQ(policy->last_position_update.value.longitude, reference_position_update.value.longitude);
+
+    ASSERT_NE(policy->last_position_update.value.altitude, old_update.value.altitude);
+    ASSERT_EQ(policy->last_position_update.value.altitude, reference_position_update.value.altitude);
+}
+
+TEST(TimeBasedUpdatePolicy, policy_uses_very_recent_updates)
+{
+    auto policy = std::make_shared<PublicTimeBasedUpdatePolicy>(std::chrono::minutes(2));
+
+    policy->last_position_update = reference_position_update;
+
+    com::ubuntu::location::Update<com::ubuntu::location::Position> new_update
+            {
+                    {
+                            com::ubuntu::location::wgs84::Latitude{10. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Longitude{60. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Altitude{10. * com::ubuntu::location::units::Meters}
+                    },
+                    timestamp + std::chrono::minutes(3)
+            };
+
+    policy->verify_update(new_update);
+
+    ASSERT_EQ(policy->last_position_update.value.latitude, new_update.value.latitude);
+    ASSERT_NE(policy->last_position_update.value.latitude, reference_position_update.value.latitude);
+
+    ASSERT_EQ(policy->last_position_update.value.longitude, new_update.value.longitude);
+    ASSERT_NE(policy->last_position_update.value.longitude, reference_position_update.value.longitude);
+
+    ASSERT_EQ(policy->last_position_update.value.altitude, new_update.value.altitude);
+    ASSERT_NE(policy->last_position_update.value.altitude, reference_position_update.value.altitude);
+}
+
+TEST(TimeBasedUpdatePolicy, policy_ignores_inaccurate_updates)
+{
+    auto policy = std::make_shared<PublicTimeBasedUpdatePolicy>(std::chrono::minutes(2));
+    reference_position_update.value.accuracy.horizontal = 1. * com::ubuntu::location::units::Meters;
+    policy->last_position_update = reference_position_update;
+
+    com::ubuntu::location::Update<com::ubuntu::location::Position> new_update
+            {
+                    {
+                            com::ubuntu::location::wgs84::Latitude{10. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Longitude{60. * com::ubuntu::location::units::Degrees},
+                            com::ubuntu::location::wgs84::Altitude{10. * com::ubuntu::location::units::Meters},
+                    },
+                    timestamp + std::chrono::minutes(1)
+            };
+    new_update.value.accuracy.horizontal = 8. * com::ubuntu::location::units::Meters;
+
+    policy->verify_update(new_update);
+    ASSERT_TRUE(*new_update.value.accuracy.horizontal > *reference_position_update.value.accuracy.horizontal);
+
+    ASSERT_NE(policy->last_position_update.value.latitude, new_update.value.latitude);
+    ASSERT_EQ(policy->last_position_update.value.latitude, reference_position_update.value.latitude);
+
+    ASSERT_NE(policy->last_position_update.value.longitude, new_update.value.longitude);
+    ASSERT_EQ(policy->last_position_update.value.longitude, reference_position_update.value.longitude);
+
+    ASSERT_NE(policy->last_position_update.value.altitude, new_update.value.altitude);
+    ASSERT_EQ(policy->last_position_update.value.altitude, reference_position_update.value.altitude);
+}