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

Fix crash in search history

Browse source
This commit is contained in:
Alex Sytnyk 2018-10-02 12:54:18 +03:00
parent d4616295ed
commit 8b895f295a
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
View file

@ -45,15 +45,12 @@ public class SearchHistoryHelper {
}
public void addNewItemToHistory(AbstractPoiType pt) {
PointDescription pd = new PointDescription(PointDescription.POINT_TYPE_POI_TYPE, pt.getKeyName());
addNewItemToHistory(new HistoryEntry(0, 0, pd));
addNewItemToHistory(new HistoryEntry(0, 0, createPointDescription(pt)));
}
public void addNewItemToHistory(PoiUIFilter filter) {
String filterId = filter.getFilterId();
PointDescription pd = new PointDescription(PointDescription.POINT_TYPE_CUSTOM_POI_FILTER, filterId);
addNewItemToHistory(new HistoryEntry(0, 0, pd));
context.getPoiFilters().markHistory(filterId, true);
addNewItemToHistory(new HistoryEntry(0, 0, createPointDescription(filter)));
context.getPoiFilters().markHistory(filter.getFilterId(), true);
}
public List<HistoryEntry> getHistoryEntries(boolean onlyPoints) {
@ -70,15 +67,36 @@ public class SearchHistoryHelper {
return res;
}
public void remove(HistoryEntry model) {
HistoryItemDBHelper helper = checkLoadedEntries();
if (helper.remove(model)) {
PointDescription pd = model.getName();
private PointDescription createPointDescription(AbstractPoiType pt) {
return new PointDescription(PointDescription.POINT_TYPE_POI_TYPE, pt.getKeyName());
}
private PointDescription createPointDescription(PoiUIFilter filter) {
return new PointDescription(PointDescription.POINT_TYPE_CUSTOM_POI_FILTER, filter.getFilterId());
}
public void remove(Object item) {
PointDescription pd = null;
if (item instanceof HistoryEntry) {
pd = ((HistoryEntry) item).getName();
} else if (item instanceof AbstractPoiType) {
pd = createPointDescription((AbstractPoiType) item);
} else if (item instanceof PoiUIFilter) {
pd = createPointDescription((PoiUIFilter) item);
}
if (pd != null) {
remove(pd);
}
}
private void remove(PointDescription pd) {
HistoryEntry model = mp.get(pd);
if (model != null && checkLoadedEntries().remove(model)) {
if (pd.isCustomPoiFilter()) {
context.getPoiFilters().markHistory(pd.getName(), false);
}
loadedEntries.remove(model);
mp.remove(model.getName());
mp.remove(pd);
}
}

3
OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
View file

@ -2370,8 +2370,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
QuickSearchDialogFragment parentFragment = (QuickSearchDialogFragment) getParentFragment();
SearchHistoryHelper helper = SearchHistoryHelper.getInstance(parentFragment.getMyApplication());
for (QuickSearchListItem searchListItem : selectedItems) {
HistoryEntry historyEntry = (HistoryEntry) searchListItem.getSearchResult().object;
helper.remove(historyEntry);
helper.remove(searchListItem.getSearchResult().object);
}
parentFragment.reloadHistory();
parentFragment.enableSelectionMode(false, -1);