Commit 811d6f6d authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '817-ambiguous_weather_options' into 'master'

Show country in weather locations

See merge request !90
parents 1b734ac2 4ecfe891
Pipeline #184414 passed with stage
in 4 minutes and 10 seconds
......@@ -98,11 +98,11 @@ public class CustomLocationPreference extends EditTextPreference
private CharSequence[] buildItemList(List<WeatherLocation> results) {
boolean needCountry = false, needPostal = false;
String countryId = results.get(0).getCountryId();
String firstCountry = results.get(0).getCountry();
HashSet<String> postalIds = new HashSet<>();
for (WeatherLocation result : results) {
if (!TextUtils.equals(result.getCountryId(), countryId)) {
if (!TextUtils.equals(result.getCountry(), firstCountry)) {
needCountry = true;
}
String postalId = result.getCountryId() + "##" + result.getCity();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment