LocationSearchFragment: update weather source/query after we get full location data

* HERE Maps needs an additional step to get full location data
* Update location model after we get this data

Author: thewizrd

app/src/main/java/com/thewizrd/simpleweather/fragments/LocationSearchFragment.java

@@ -172,30 +172,12 @@ public LocationData call() throws CustomException, InterruptedException, Weather
                                 throw new CustomException(R.string.error_retrieve_location);
                             }
 
-                            final boolean isUS = LocationUtils.isUS(queryResult.getLocationCountry());
-
-                            if (!Settings.isWeatherLoaded()) {
-                                // Default US provider to NWS
-                                if (isUS) {
-                                    Settings.setAPI(WeatherAPI.NWS);
-                                    queryResult.updateWeatherSource(WeatherAPI.NWS);
-                                } else {
-                                    Settings.setAPI(WeatherAPI.HERE);
-                                    queryResult.updateWeatherSource(WeatherAPI.HERE);
-                                }
-                                wm.updateAPI();
-                            }
-
                             if (Settings.usePersonalKey() && StringUtils.isNullOrWhitespace(Settings.getAPIKEY()) && wm.isKeyRequired()) {
                                 throw new CustomException(R.string.werror_invalidkey);
                             }
 
                             TaskUtils.throwIfCancellationRequested(token);
 
-                            if (WeatherAPI.NWS.equals(Settings.getAPI()) && !LocationUtils.isUS(queryResult.getLocationCountry())) {
-                                throw new CustomException(R.string.error_message_weather_us_only);
-                            }
-
                             // Need to get FULL location data for HERE API
                             // Data provided is incomplete
                             if (WeatherAPI.HERE.equals(queryResult.getLocationSource())
@@ -214,6 +196,24 @@ public LocationQueryViewModel call() throws WeatherException {
                                 throw new InterruptedException();
                             }
 
+                            final boolean isUS = LocationUtils.isUS(queryResult.getLocationCountry());
+
+                            if (!Settings.isWeatherLoaded()) {
+                                // Default US provider to NWS
+                                if (isUS) {
+                                    Settings.setAPI(WeatherAPI.NWS);
+                                    queryResult.updateWeatherSource(WeatherAPI.NWS);
+                                } else {
+                                    Settings.setAPI(WeatherAPI.HERE);
+                                    queryResult.updateWeatherSource(WeatherAPI.HERE);
+                                }
+                                wm.updateAPI();
+                            }
+
+                            if (WeatherAPI.NWS.equals(Settings.getAPI()) && !isUS) {
+                                throw new CustomException(R.string.error_message_weather_us_only);
+                            }
+
                             // Check if location already exists
                             List<LocationData> locData = Settings.getLocationData();
                             final LocationQueryViewModel finalQueryResult = queryResult;

wearapp/src/main/java/com/thewizrd/simpleweather/fragments/LocationSearchFragment.java

@@ -143,30 +143,12 @@ public LocationData call() throws CustomException, WeatherException, Interrupted
                                 throw new CustomException(R.string.error_retrieve_location);
                             }
 
-                            final boolean isUS = LocationUtils.isUS(queryResult.getLocationCountry());
-
-                            if (!Settings.isWeatherLoaded()) {
-                                // Default US provider to NWS
-                                if (isUS) {
-                                    Settings.setAPI(WeatherAPI.NWS);
-                                    queryResult.updateWeatherSource(WeatherAPI.NWS);
-                                } else {
-                                    Settings.setAPI(WeatherAPI.HERE);
-                                    queryResult.updateWeatherSource(WeatherAPI.HERE);
-                                }
-                                wm.updateAPI();
-                            }
-
                             if (Settings.usePersonalKey() && StringUtils.isNullOrWhitespace(Settings.getAPIKEY()) && wm.isKeyRequired()) {
                                 throw new WeatherException(WeatherUtils.ErrorStatus.INVALIDAPIKEY);
                             }
 
                             TaskUtils.throwIfCancellationRequested(token);
 
-                            if (WeatherAPI.NWS.equals(Settings.getAPI()) && !isUS) {
-                                throw new CustomException(R.string.error_message_weather_us_only);
-                            }
-
                             // Need to get FULL location data for HERE API
                             // Data provided is incomplete
                             if (WeatherAPI.HERE.equals(queryResult.getLocationSource())
@@ -185,7 +167,23 @@ public LocationQueryViewModel call() throws WeatherException {
                                 throw new InterruptedException();
                             }
 
-                            TaskUtils.throwIfCancellationRequested(token);
+                            final boolean isUS = LocationUtils.isUS(queryResult.getLocationCountry());
+
+                            if (!Settings.isWeatherLoaded()) {
+                                // Default US provider to NWS
+                                if (isUS) {
+                                    Settings.setAPI(WeatherAPI.NWS);
+                                    queryResult.updateWeatherSource(WeatherAPI.NWS);
+                                } else {
+                                    Settings.setAPI(WeatherAPI.HERE);
+                                    queryResult.updateWeatherSource(WeatherAPI.HERE);
+                                }
+                                wm.updateAPI();
+                            }
+
+                            if (WeatherAPI.NWS.equals(Settings.getAPI()) && !isUS) {
+                                throw new CustomException(R.string.error_message_weather_us_only);
+                            }
 
                             // Get weather data
                             LocationData location = new LocationData(queryResult);