kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #3339 from trashkalmar/keep-map-search-results-order-2

Browse source 
[android][downloader] fix: Do not check search results at all.
This commit is contained in:
Dmitry Yunitsky 2016-05-25 19:10:40 +03:00
commit cf19634abb
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
View file

@ -4,12 +4,10 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import java.util.LinkedHashMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
@ -42,7 +40,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
private final NativeMapSearchListener mSearchListener = new NativeMapSearchListener()
{
private final Map<String, CountryItem> mResults = new LinkedHashMap<>();
private final List<CountryItem> mResults = new ArrayList<>();
@Override
public void onMapSearchResults(Result[] results, long timestamp, boolean isLast)
@ -52,17 +50,14 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
for (Result result : results)
{
if (TextUtils.isEmpty(result.countryId) || mResults.containsKey(result.countryId))
continue;
CountryItem item = CountryItem.fill(result.countryId);
item.searchResultName = result.matchedString;
mResults.put(result.countryId, item);
mResults.add(item);
}
if (isLast)
{
mAdapter.setSearchResultsMode(mResults.values(), mToolbarController.getQuery());
mAdapter.setSearchResultsMode(mResults, mToolbarController.getQuery());
mResults.clear();
onSearchEnd();