Allow input custom weather api key

RyanDam · May 2, 2020 · aed4edf · aed4edf
1 parent 1cf56c4
commit aed4edf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
@@ -45,4 +45,6 @@
     <property id="enable_buffering" type="boolean">false</property>
 
     <property id="barometer_unit" type="number">0</property>
+
+    <property id="openweathermap_api" type="string"></property>
 </properties>
diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
@@ -1,5 +1,5 @@
 <settings>
-
+	
     <setting propertyKey="@Properties.theme_code" title="@Strings.theme_code">
         <settingConfig type="list">
         	<listEntry value="0">@Strings.theme_dark</listEntry>
@@ -419,4 +419,7 @@
         	<listEntry value="1">@Strings.barometer_unit_1</listEntry>
         </settingConfig>
     </setting>
+    <setting propertyKey="@Properties.openweathermap_api" title="@Strings.openweathermap_api">
+        <settingConfig type="alphaNumeric" />
+    </setting>
 </settings>
diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -142,4 +142,6 @@
     <string id="barometer_unit">Barometer Unit</string>
     <string id="barometer_unit_0">Hector Pascal (Pa)</string>
     <string id="barometer_unit_1">Inches of Mercury (inHg)</string>
+
+    <string id="openweathermap_api">OpenWeatherMap API key, read FAQs section for more info</string>
 </strings>
diff --git a/source/BackgroundService.mc b/source/BackgroundService.mc
@@ -17,15 +17,21 @@ class BackgroundService extends Sys.ServiceDelegate {
 	(:background_method)
 	function onTemporalEvent() {
 		Sys.println("onTemporalEvent");
+
 		var pendingWebRequests = App.getApp().getProperty("PendingWebRequests");
 		if (pendingWebRequests != null) {
 			if (pendingWebRequests["OpenWeatherMapCurrent"] != null) {
+
+				var api_key = App.getApp().getProperty("openweathermap_api");
+				if (api_key.length() == 0) {
+					api_key = "333d6a4283794b870f5c717cc48890b5"; // default apikey
+				}
 				makeWebRequest(
 					"https://api.openweathermap.org/data/2.5/weather",
 					{
 						"lat" => App.getApp().getProperty("LastLocationLat"),
 						"lon" => App.getApp().getProperty("LastLocationLng"),
-						"appid" => "333d6a4283794b870f5c717cc48890b5",
+						"appid" => api_key,
 						"units" => "metric" // Celcius.
 					},
 					method(:onReceiveOpenWeatherMapCurrent)