Skip to content

Switch OpenWeatherMap API URLs to HTTPS #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SkewedZeppelin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch OpenWeatherMap API URLs to HTTPS #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f43efc
Switch OpenWeatherMap API URLs to HTTPs
SkewedZeppelin Nov 3, 2017
61324ba
Fix Travis CI
SkewedZeppelin Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
script: ./gradlew build --stacktrace
2 changes: 1 addition & 1 deletion app/src/main/java/org/asdtm/goodweather/utils/ApiKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/asdtm/goodweather/utils/CityParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/asdtm/goodweather/utils/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/licenses.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
</resources>