Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE

Browse source
This commit is contained in:
Alexey Kulish 2016-10-03 11:36:31 +03:00
parent 9b3e1f528e
commit 103adf8a90
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/phrases.xml
View file

@ -213,7 +213,7 @@
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">Octane 80</string>
<string name="poi_fuel_octane_91">Octane 91</string>
<string name="poi_fuel_octane_92">Octane 92</string>
<string name="poi_fuel_octane_92">Octane &#x0025;&#x0025;92</string>
<string name="poi_fuel_octane_95">Octane 95</string>
<string name="poi_fuel_octane_98">Octane 98</string>
<string name="poi_fuel_octane_100">Octane 100</string>

5
OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
View file

@ -340,7 +340,10 @@ public class PoiFiltersHelper {
public void loadSelectedPoiFilters() {
Set<String> filters = application.getSettings().getSelectedPoiFilters();
for (String f : filters) {
selectedPoiFilters.add(getFilterById(f));
PoiUIFilter filter = getFilterById(f);
if (filter != null) {
selectedPoiFilters.add(filter);
}
}
}