Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

app/src/apiOreo/java/foundation/e/blisslauncher/features/weather/CustomLocationPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -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();