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

Merge pull request #4187 from osmandapp/alex_fixes

Browse source 
FIx NPE
This commit is contained in:
vshcherb 2017-07-24 13:36:42 +02:00 committed by GitHub
commit 072e120337
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
View file

@ -579,7 +579,11 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
private void putAllAcceptedTypes(Map<PoiCategory, LinkedHashSet<String>> types) {
for (PoiCategory category : types.keySet()) {
if (acceptedTypes.containsKey(category)) {
acceptedTypes.get(category).addAll(types.get(category));
if (acceptedTypes.get(category) != null && types.get(category) != null) {
acceptedTypes.get(category).addAll(types.get(category));
} else {
acceptedTypes.put(category, null);
}
} else {
acceptedTypes.put(category, types.get(category));
}