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:
Victor Shcherb 2015-08-05 00:10:01 +02:00
parent 640c3aa5e6
commit fb0b2c318e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
View file

@ -121,7 +121,11 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
public List<Object> getFilters(String s) {
List<Object> filters = new ArrayList<Object>() ;
PoiFiltersHelper poiFilters = getApp().getPoiFilters();
OsmandApplication app = getApp();
if(app == null) {
return filters;
}
PoiFiltersHelper poiFilters = app.getPoiFilters();
if (Algorithms.isEmpty(s)) {
filters.addAll(poiFilters.getTopDefinedPoiFilters());
} else {
@ -131,7 +135,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
}
}
Map<String, AbstractPoiType> res =
getApp().getPoiTypes().getAllTypesTranslatedNames(new CollatorStringMatcher(s, StringMatcherMode.CHECK_STARTS_FROM_SPACE));
app.getPoiTypes().getAllTypesTranslatedNames(new CollatorStringMatcher(s, StringMatcherMode.CHECK_STARTS_FROM_SPACE));
for(AbstractPoiType p : res.values()) {
filters.add(p);
}
@ -145,6 +149,10 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
}
public OsmandApplication getApp(){
FragmentActivity activity = getActivity();
if(activity == null) {
return null;
}
return (OsmandApplication) getActivity().getApplication();
}