diff --git a/OsmAnd-java/src/net/osmand/search/SearchUICore.java b/OsmAnd-java/src/net/osmand/search/SearchUICore.java index 18600f6d34..2e81416e62 100644 --- a/OsmAnd-java/src/net/osmand/search/SearchUICore.java +++ b/OsmAnd-java/src/net/osmand/search/SearchUICore.java @@ -53,15 +53,13 @@ public class SearchUICore { private Collator collator; - public SearchUICore(MapPoiTypes poiTypes, String locale, BinaryMapIndexReader[] searchIndexes) { + public SearchUICore(MapPoiTypes poiTypes, String locale) { this.poiTypes = poiTypes; - List searchIndexesList = Arrays.asList(searchIndexes); taskQueue = new LinkedBlockingQueue(); - searchSettings = new SearchSettings(searchIndexesList); + searchSettings = new SearchSettings(new ArrayList()); searchSettings = searchSettings.setLang(locale); phrase = new SearchPhrase(searchSettings); singleThreadedExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, taskQueue); - init(); collator = OsmAndCollator.primaryCollator(); } diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java index bb113cff3e..824adecfe1 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java @@ -31,7 +31,7 @@ public class QuickSearchHelper { public QuickSearchHelper(OsmandApplication app) { this.app = app; - core = new SearchUICore(app.getPoiTypes(), app.getSettings().MAP_PREFERRED_LOCALE.get(), new BinaryMapIndexReader[]{}); + core = new SearchUICore(app.getPoiTypes(), app.getSettings().MAP_PREFERRED_LOCALE.get()); } public SearchUICore getCore() { @@ -40,6 +40,7 @@ public class QuickSearchHelper { public void initSearchUICore() { setRepositoriesForSearchUICore(app); + core.init(); // Register favorites search api core.registerAPI(new SearchCoreFactory.SearchBaseAPI() {