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

added boolean isEmpty and refactored some code

Browse source
This commit is contained in:
Chumva 2018-03-26 11:33:46 +03:00
parent befaa12c80
commit 2cacac9b60
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
View file

@ -116,6 +116,8 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
} }
public boolean isCityEmpty(City c, SearchResult sr) { public boolean isCityEmpty(City c, SearchResult sr) {
final boolean isEmpty[] = new boolean[1];
isEmpty[0] = true;
if (c.getStreets().isEmpty()) { if (c.getStreets().isEmpty()) {
ResultMatcher<Street> resultMatcher = new ResultMatcher<Street>() { ResultMatcher<Street> resultMatcher = new ResultMatcher<Street>() {
boolean isCancelled = false; boolean isCancelled = false;
@ -123,7 +125,8 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
@Override @Override
public boolean publish(Street object) { public boolean publish(Street object) {
isCancelled = true; isCancelled = true;
return true; isEmpty[0] = false;
return false;
} }
@Override @Override
@ -133,17 +136,13 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
}; };
try { try {
sr.file.preloadStreets(c, BinaryMapIndexReader.buildAddressRequest(resultMatcher)); sr.file.preloadStreets(c, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
if (c.getStreets().isEmpty()) {
return true;
} else {
c.unregisterStreet(c.getStreets().get(0));
return false;
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} else {
isEmpty[0] = false;
} }
return false; return isEmpty[0];
} }
@Override @Override