Merge branch 'master' of github.com:osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2015-10-21 11:57:39 +02:00
commit 3bd3f042ec

View file

@ -325,7 +325,13 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
}
private void processGroup(DownloadResourceGroup group, List<Object> filter, List<List<String>> conds) {
String name = group.getName(ctx).toLowerCase();
String name = null;
if (group.getRegion() != null && group.getRegion().getSearchText() != null) {
name = group.getRegion().getSearchText().toLowerCase();
}
if (name == null) {
name = group.getName(ctx).toLowerCase();
}
if (group.getType().isScreen() && group.getParentGroup() != null
&& group.getParentGroup().getParentGroup() != null
&& group.getParentGroup().getParentGroup().getType() != DownloadResourceGroupType.WORLD