aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-04-13 16:52:37 -0700
committerAdnan Begovic <adnan@cyngn.com>2016-04-13 17:06:57 -0700
commit4ebc755b85fa624ab7089d237e247e1d0aa4c7c6 (patch)
tree094924f207ef79b57c956575c162aca89066cec9
parent6a921abb220881d71688767bda814e2e3e4a11ca (diff)
downloadandroid_packages_apps_WundergroundWeatherProvider-4ebc755b85fa624ab7089d237e247e1d0aa4c7c6.tar.gz
android_packages_apps_WundergroundWeatherProvider-4ebc755b85fa624ab7089d237e247e1d0aa4c7c6.tar.bz2
android_packages_apps_WundergroundWeatherProvider-4ebc755b85fa624ab7089d237e247e1d0aa4c7c6.zip
WundergroundCM: Handle null city disambiguation list.
Change-Id: I919ff9501b8f81bccdfed10167cacab04d6ffb59
-rw-r--r--app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WundergroundWeatherProviderService.java5
-rw-r--r--app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/wunderground/WundergroundServiceManager.java8
2 files changed, 9 insertions, 4 deletions
diff --git a/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WundergroundWeatherProviderService.java b/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WundergroundWeatherProviderService.java
index c09ff9d..e54ee88 100644
--- a/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WundergroundWeatherProviderService.java
+++ b/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WundergroundWeatherProviderService.java
@@ -278,6 +278,11 @@ public class WundergroundWeatherProviderService extends WeatherProviderService
List<CityDisambiguationResponse> cityDisambiguationResponses =
wundergroundReponse.getCityDisambiguation();
+ if (cityDisambiguationResponses == null) {
+ serviceRequest.fail();
+ return;
+ }
+
ArrayList<WeatherLocation> weatherLocations =
ConverterUtils.convertDisambiguationsToWeatherLocations(
cityDisambiguationResponses);
diff --git a/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/wunderground/WundergroundServiceManager.java b/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/wunderground/WundergroundServiceManager.java
index 359730a..ffcde0e 100644
--- a/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/wunderground/WundergroundServiceManager.java
+++ b/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/wunderground/WundergroundServiceManager.java
@@ -64,13 +64,13 @@ public class WundergroundServiceManager {
private Retrofit buildRestAdapter(String apiKey) {
//TODO: Wrap this in debug flag
- HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
- interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
- OkHttpClient client = new OkHttpClient.Builder().addInterceptor(interceptor).build();
+ //HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+ //interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+ //OkHttpClient client = new OkHttpClient.Builder().addInterceptor(interceptor).build();
return new Retrofit.Builder()
.baseUrl("http://api.wunderground.com/api/" + apiKey + "/")
- .client(client)
+ //.client(client)
.addConverterFactory(GsonConverterFactory.create())
.build();
}