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

don't show duplicates fragment for history search items

Browse source
This commit is contained in:
nazar-kutz 2020-11-19 13:30:52 +02:00
parent 02da17f726
commit ce498d7e04
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/settings/backend/backup/CollectionSettingsItem.java
View file

@ -68,6 +68,10 @@ public abstract class CollectionSettingsItem<T> extends SettingsItem {
return res; return res;
} }
public boolean shouldShowDuplicates() {
return true;
}
public abstract boolean isDuplicate(@NonNull T item); public abstract boolean isDuplicate(@NonNull T item);
@NonNull @NonNull

5
OsmAnd/src/net/osmand/plus/settings/backend/backup/SearchHistorySettingsItem.java
View file

@ -143,6 +143,11 @@ public class SearchHistorySettingsItem extends CollectionSettingsItem<HistoryEnt
return false; return false;
} }
@Override
public boolean shouldShowDuplicates() {
return false;
}
@Override @Override
public boolean shouldReadOnCollecting() { public boolean shouldReadOnCollecting() {
return true; return true;

5
OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
View file

@ -428,8 +428,9 @@ public class SettingsHelper {
duplicateItems.add(((ProfileSettingsItem) item).getModeBean()); duplicateItems.add(((ProfileSettingsItem) item).getModeBean());
} }
} else if (item instanceof CollectionSettingsItem<?>) { } else if (item instanceof CollectionSettingsItem<?>) {
List<?> duplicates = ((CollectionSettingsItem<?>) item).processDuplicateItems(); CollectionSettingsItem settingsItem = (CollectionSettingsItem) item;
if (!duplicates.isEmpty()) { List<?> duplicates = settingsItem.processDuplicateItems();
if (!duplicates.isEmpty() && settingsItem.shouldShowDuplicates()) {
duplicateItems.addAll(duplicates); duplicateItems.addAll(duplicates);
} }
} else if (item instanceof FileSettingsItem) { } else if (item instanceof FileSettingsItem) {

4
OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java
View file

@ -321,10 +321,6 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment {
duplicates.add(getString(R.string.markers_history)); duplicates.add(getString(R.string.markers_history));
duplicates.addAll(markersHistoryGroups); duplicates.addAll(markersHistoryGroups);
} }
if (!historyEntries.isEmpty()) {
duplicates.add(getString(R.string.shared_string_search_history));
duplicates.addAll(historyEntries);
}
return duplicates; return duplicates;
} }