From 1f43efc98bdfa9890fa56bb2b24284a9280c476e Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 3 Nov 2017 14:39:24 -0400
Subject: [PATCH 1/2] Switch OpenWeatherMap API URLs to HTTPs

See http://openweathermap.org/news/post/ssl-free-and-startup-accounts
---
 app/src/main/java/org/asdtm/goodweather/utils/ApiKeys.java    | 2 +-
 app/src/main/java/org/asdtm/goodweather/utils/CityParser.java | 2 +-
 app/src/main/java/org/asdtm/goodweather/utils/Constants.java  | 4 ++--
 app/src/main/res/values/licenses.xml                          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/asdtm/goodweather/utils/ApiKeys.java b/app/src/main/java/org/asdtm/goodweather/utils/ApiKeys.java
index ded7c06d..e5c1284c 100644
--- a/app/src/main/java/org/asdtm/goodweather/utils/ApiKeys.java
+++ b/app/src/main/java/org/asdtm/goodweather/utils/ApiKeys.java
@@ -3,7 +3,7 @@
 public class ApiKeys {
 
     /**
-     * API key for http://openweathermap.org/api
+     * API key for https://openweathermap.org/api
      */
     public static final String OPEN_WEATHER_MAP_API_KEY = "1487dd8a93bfd85d278d9ac8dcfee94c";
 }
diff --git a/app/src/main/java/org/asdtm/goodweather/utils/CityParser.java b/app/src/main/java/org/asdtm/goodweather/utils/CityParser.java
index e187d287..1206705f 100644
--- a/app/src/main/java/org/asdtm/goodweather/utils/CityParser.java
+++ b/app/src/main/java/org/asdtm/goodweather/utils/CityParser.java
@@ -19,7 +19,7 @@
 public class CityParser {
 
     private static final String TAG = "CityParser";
-    private static final String ENDPOINT = "http://api.openweathermap.org/data/2.5/find";
+    private static final String ENDPOINT = "https://api.openweathermap.org/data/2.5/find";
     private static final String APPID = ApiKeys.OPEN_WEATHER_MAP_API_KEY;
 
     public static List<CitySearch> getCity(String query) {
diff --git a/app/src/main/java/org/asdtm/goodweather/utils/Constants.java b/app/src/main/java/org/asdtm/goodweather/utils/Constants.java
index c265a930..56a3b182 100644
--- a/app/src/main/java/org/asdtm/goodweather/utils/Constants.java
+++ b/app/src/main/java/org/asdtm/goodweather/utils/Constants.java
@@ -70,8 +70,8 @@ public class Constants {
     public static final String GOOGLE_PLAY_WEB_URI =
             "http://play.google.com/store/apps/details?id=%s";
     public static final String F_DROID_WEB_URI = "https://f-droid.org/repository/browse/?fdid=%s";
-    public static final String WEATHER_ENDPOINT = "http://api.openweathermap.org/data/2.5/weather";
-    public static final String WEATHER_FORECAST_ENDPOINT = "http://api.openweathermap.org/data/2.5/forecast/daily";
+    public static final String WEATHER_ENDPOINT = "https://api.openweathermap.org/data/2.5/weather";
+    public static final String WEATHER_FORECAST_ENDPOINT = "https://api.openweathermap.org/data/2.5/forecast/daily";
 
     public static final String BITCOIN_ADDRESS = "1FV8m1MKqZ9ZKB8YNwpsjsuubHTznJSiT8";
 
diff --git a/app/src/main/res/values/licenses.xml b/app/src/main/res/values/licenses.xml
index de071b05..2c734c47 100644
--- a/app/src/main/res/values/licenses.xml
+++ b/app/src/main/res/values/licenses.xml
@@ -10,7 +10,7 @@
         <a href='https://github.com/PhilJay/MPAndroidChart'>MPAndroidChart</a>
         (<a href='file:///android_asset/licenses/MPAndroidChart'>license</a>)\n
 
-        <a href='http://openweathermap.org/'>OpenWeatherMap</a>
+        <a href='https://openweathermap.org/'>OpenWeatherMap</a>
         (<a href='file:///android_asset/licenses/OpenWeatherMap'>license</a>)\n
 
         <a href='https://github.com/google/roboto/'>Roboto</a>
@@ -19,4 +19,4 @@
         <a href='https://erikflowers.github.io/weather-icons/'>Weather Icons</a>
         (<a href='file:///android_asset/licenses/WeatherIcons'>license</a>)
     </string>
-</resources>
\ No newline at end of file
+</resources>

From 61324ba2507a670838dcabf63f62c94d22431519 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 3 Nov 2017 15:09:55 -0400
Subject: [PATCH 2/2] Fix Travis CI

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 40b9a165..a65e754b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,9 @@ android:
 # Accept ConstraintLayout license
 before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
   - chmod +x gradlew
   - ./gradlew dependencies || true
 
-script: ./gradlew build --stacktrace
\ No newline at end of file
+script: ./gradlew build --stacktrace