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

Fixed #2200 bug when search queue took space into account.

Browse source
This commit is contained in:
GaidamakUA 2016-02-11 17:58:42 +02:00
parent d41eee60b1
commit efb58c6369
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -316,12 +316,13 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
}
private void changeFilter(CharSequence s) {
String queue = s.toString().trim();
// if (!isNameSearch() ) {
amenityAdapter.getFilter().filter(s);
amenityAdapter.getFilter().filter(queue);
String cfilter = filter == null || filter.getFilterByName() == null ? "" :
filter.getFilterByName().toLowerCase();
if(!isNameSearch() && !s.toString().toLowerCase().startsWith(cfilter)) {
filter.setFilterByName(s.toString());
if(!isNameSearch() && !queue.toString().toLowerCase().startsWith(cfilter)) {
filter.setFilterByName(queue.toString());
runNewSearchQuery(location, SEARCH_AGAIN);
}
updateButtonState();

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

@ -157,8 +157,8 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
filters.add(pf);
}
}
List<AbstractPoiType> res =
app.getPoiTypes().getAllTypesTranslatedNames(new CollatorStringMatcher(s, StringMatcherMode.CHECK_STARTS_FROM_SPACE));
List<AbstractPoiType> res = app.getPoiTypes().getAllTypesTranslatedNames(
new CollatorStringMatcher(s, StringMatcherMode.CHECK_STARTS_FROM_SPACE));
final Collator inst = Collator.getInstance();
Collections.sort(res, new Comparator<AbstractPoiType>() {
@Override