Merge lp:~vthompson/ubuntu-weather-app/reboot-default-OWM-blank-key into lp:ubuntu-weather-app

[Victor Thompson]

* Default to OWM if the key file for TWC is blank.

* Default to OWM if the key file for TWC is blank.

This MP defaults the app to OWM when the key is blank. I think this is the best solution for the app not working when the key isn't in the source tree.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/67/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/58/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/67/console

review: Needs Fixing (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/reboot-default-OWM-blank-key]

64. By Victor Thompson on 2015-07-25

Merge and resolve conflict

[Andrew Hayzen (ahayzen)]

Damn conflicts, reapproving :-)

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-06-28 19:04:43 +0000
+++ app/ubuntu-weather-app.qml	2015-07-25 21:09:54 +0000
@@ -153,6 +153,10 @@
                 units = metric ? "metric" : "imperial"
                 windUnits = metric ? "kph" : "mph"
             }
+
+            if (Key.twcKey === "") {  // No API key for TWC, so use OWM
+                service = "openweathermap"
+            }
         }
     }
 

=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml	2015-06-21 14:54:05 +0000
+++ app/ui/settings/DataProviderPage.qml	2015-07-25 21:09:54 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.2
 import "../../components"
+import "../../data/key.js" as Key
 
 Page {
     title: i18n.tr("Data Provider")
@@ -26,7 +27,6 @@
     ListModel {
         id: dataProviderModel
         ListElement { text: "OpenWeatherMap" }
-        ListElement { text: "The Weather Channel" }
     }
 
     ExpandableListItem {
@@ -51,4 +51,11 @@
             }
         }
     }
+
+    Component.onCompleted: {
+        // If the key file for TWC is not blank, add the service to the model
+        if (Key.twcKey !== "") {
+            dataProviderModel.append({ text: "The Weather Channel" })
+        }
+    }
 }

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-18 20:59:12 +0000
+++ debian/changelog	2015-07-25 21:09:54 +0000
@@ -2,6 +2,7 @@
 
   [ Victor Thompson ]
   * Sync debian version with click version.
+  * Default to OWM if the key file for TWC is blank.
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data