Merge lp:~vthompson/ubuntu-weather-app/reboot-migrate-locations into lp:ubuntu-weather-app

[Victor Thompson]

Properly migrate Locations.

Properly migrate Locations.

To test without downgrading to the old app and upgrading to the new app, simply remove addedCurrentLocation from your ~/.config/com.ubuntu.weather/com.ubuntu.weather.conf file.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:55
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/116/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/86
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/116

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/116/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-)

I tested importing from the old app normally, with no location detection/data, with no location detection. And a few other combos, everything works as expected :-)

review: Approve

=== modified file 'app/data/Storage.qml'
--- app/data/Storage.qml	2015-05-09 00:47:22 +0000
+++ app/data/Storage.qml	2015-06-18 03:58:46 +0000
@@ -121,6 +121,12 @@
         return res;
     }
 
+    function insertLocationAtStart(data) {
+        var res = insertLocation(data);
+        reorder(res, 0);
+        return 0;
+    }
+
     function updateLocation(dbId, data) {
         openDB();
         db.transaction( function(tx){
 
=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-06-10 01:47:37 +0000
+++ app/ubuntu-weather-app.qml	2015-06-18 03:58:46 +0000
@@ -148,6 +148,7 @@
         property string units
         property string windUnits
 
+        property bool addedCurrentLocation: false
         property bool migrated: false
 
         Component.onCompleted: {
@@ -170,8 +171,9 @@
         // Add or replace the current locaiton to the storage and refresh the
         // locationList
         function updateCurrentLocation(location) {
-            if (locationsList == null || locationsList.length == 0) {
-                storage.insertLocation({location: location});
+            if (!settings.addedCurrentLocation || locationsList == null || locationsList.length == 0) {
+                storage.insertLocationAtStart({location: location});
+                settings.addedCurrentLocation = true;
             } else {
                 storage.updateLocation(locationsList[0].db.id, {location: location});
             }
 
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-06-14 21:17:22 +0000
+++ app/ui/LocationsPage.qml	2015-06-18 03:58:46 +0000
@@ -72,7 +72,7 @@
                 left: parent.left
                 right: parent.right
             }
-            height: units.gu(8)
+            height: settings.addedCurrentLocation ? units.gu(8) : units.gu(0)
             interactive: false
             model: currentLocationModel
             delegate: WeatherListItem {
@@ -262,7 +262,7 @@
                 "icon": iconMap[data.data[0].current.icon]
             }
 
-            if (i > 0) {
+            if (!settings.addedCurrentLocation || i > 0) {
                 locationsModel.append(loc)
             } else {
                 currentLocationModel.append(loc)