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

Fix duplicate items write to json

Browse source
This commit is contained in:
Vitaliy 2020-03-25 12:32:14 +02:00
parent 5009e9d149
commit 30c7effa11
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
View file

@ -12,13 +12,16 @@ import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager; import net.osmand.map.TileSourceManager;
import net.osmand.plus.SettingsHelper.AvoidRoadsSettingsItem; import net.osmand.plus.SettingsHelper.AvoidRoadsSettingsItem;
import net.osmand.plus.SettingsHelper.MapSourcesSettingsItem; import net.osmand.plus.SettingsHelper.MapSourcesSettingsItem;
import net.osmand.plus.SettingsHelper.PluginSettingsItem;
import net.osmand.plus.SettingsHelper.PoiUiFilterSettingsItem; import net.osmand.plus.SettingsHelper.PoiUiFilterSettingsItem;
import net.osmand.plus.SettingsHelper.ProfileSettingsItem;
import net.osmand.plus.SettingsHelper.QuickActionsSettingsItem; import net.osmand.plus.SettingsHelper.QuickActionsSettingsItem;
import net.osmand.plus.SettingsHelper.SettingsCollectListener; import net.osmand.plus.SettingsHelper.SettingsCollectListener;
import net.osmand.plus.SettingsHelper.SettingsItem; import net.osmand.plus.SettingsHelper.SettingsItem;
import net.osmand.plus.helpers.AvoidSpecificRoads; import net.osmand.plus.helpers.AvoidSpecificRoads;
import net.osmand.plus.poi.PoiUIFilter; import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.quickaction.QuickAction; import net.osmand.plus.quickaction.QuickAction;
import net.osmand.plus.quickaction.QuickActionRegistry;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -81,7 +84,23 @@ public class CustomOsmandPlugin extends OsmandPlugin {
@Override @Override
public void onSettingsCollectFinished(boolean succeed, boolean empty, @NonNull List<SettingsItem> items) { public void onSettingsCollectFinished(boolean succeed, boolean empty, @NonNull List<SettingsItem> items) {
if (succeed && !items.isEmpty()) { if (succeed && !items.isEmpty()) {
for (Iterator<SettingsItem> iterator = items.iterator(); iterator.hasNext(); ) {
SettingsItem item = iterator.next();
if (item instanceof ProfileSettingsItem) {
ProfileSettingsItem profileSettingsItem = (ProfileSettingsItem) item;
ApplicationMode mode = profileSettingsItem.getAppMode();
ApplicationMode savedMode = ApplicationMode.valueOfStringKey(mode.getStringKey(), null);
if (savedMode != null) {
ApplicationMode.changeProfileAvailability(savedMode, true, app);
}
iterator.remove();
} else if (item instanceof PluginSettingsItem) {
iterator.remove();
} else {
item.setShouldReplace(true);
}
}
app.getSettingsHelper().importSettings(file, items, "", 1, null);
} }
} }
}); });
@ -96,14 +115,14 @@ public class CustomOsmandPlugin extends OsmandPlugin {
if (item instanceof QuickActionsSettingsItem) { if (item instanceof QuickActionsSettingsItem) {
QuickActionsSettingsItem quickActionsSettingsItem = (QuickActionsSettingsItem) item; QuickActionsSettingsItem quickActionsSettingsItem = (QuickActionsSettingsItem) item;
List<QuickAction> quickActions = quickActionsSettingsItem.getItems(); List<QuickAction> quickActions = quickActionsSettingsItem.getItems();
QuickActionRegistry actionRegistry = app.getQuickActionRegistry();
for (QuickAction action : quickActions) { for (QuickAction action : quickActions) {
QuickAction savedAction = app.getQuickActionRegistry().getQuickAction(app, action.getType(), action.getName(app), action.getParams()); QuickAction savedAction = actionRegistry.getQuickAction(app, action.getType(), action.getName(app), action.getParams());
if (savedAction != null) { if (savedAction != null) {
app.getQuickActionRegistry().deleteQuickAction(savedAction); actionRegistry.deleteQuickAction(savedAction);
} }
} }
} } else if (item instanceof MapSourcesSettingsItem) {
if (item instanceof MapSourcesSettingsItem) {
MapSourcesSettingsItem mapSourcesSettingsItem = (MapSourcesSettingsItem) item; MapSourcesSettingsItem mapSourcesSettingsItem = (MapSourcesSettingsItem) item;
List<ITileSource> mapSources = mapSourcesSettingsItem.getItems(); List<ITileSource> mapSources = mapSourcesSettingsItem.getItems();
@ -114,21 +133,26 @@ public class CustomOsmandPlugin extends OsmandPlugin {
// ((SQLiteTileSource) tileSource).createDataBase(); // ((SQLiteTileSource) tileSource).createDataBase();
} }
} }
} } else if (item instanceof PoiUiFilterSettingsItem) {
if (item instanceof PoiUiFilterSettingsItem) {
PoiUiFilterSettingsItem poiUiFilterSettingsItem = (PoiUiFilterSettingsItem) item; PoiUiFilterSettingsItem poiUiFilterSettingsItem = (PoiUiFilterSettingsItem) item;
List<PoiUIFilter> poiUIFilters = poiUiFilterSettingsItem.getItems(); List<PoiUIFilter> poiUIFilters = poiUiFilterSettingsItem.getItems();
for (PoiUIFilter filter : poiUIFilters) { for (PoiUIFilter filter : poiUIFilters) {
app.getPoiFilters().removePoiFilter(filter); app.getPoiFilters().removePoiFilter(filter);
} }
app.getSearchUICore().refreshCustomPoiFilters(); app.getSearchUICore().refreshCustomPoiFilters();
} } else if (item instanceof AvoidRoadsSettingsItem) {
if (item instanceof AvoidRoadsSettingsItem) {
AvoidRoadsSettingsItem avoidRoadsSettingsItem = (AvoidRoadsSettingsItem) item; AvoidRoadsSettingsItem avoidRoadsSettingsItem = (AvoidRoadsSettingsItem) item;
List<AvoidSpecificRoads.AvoidRoadInfo> avoidRoadInfos = avoidRoadsSettingsItem.getItems(); List<AvoidSpecificRoads.AvoidRoadInfo> avoidRoadInfos = avoidRoadsSettingsItem.getItems();
for (AvoidSpecificRoads.AvoidRoadInfo avoidRoad : avoidRoadInfos) { for (AvoidSpecificRoads.AvoidRoadInfo avoidRoad : avoidRoadInfos) {
app.getAvoidSpecificRoads().removeImpassableRoad(avoidRoad); app.getAvoidSpecificRoads().removeImpassableRoad(avoidRoad);
} }
} else if (item instanceof ProfileSettingsItem) {
ProfileSettingsItem profileSettingsItem = (ProfileSettingsItem) item;
ApplicationMode mode = profileSettingsItem.getAppMode();
ApplicationMode savedMode = ApplicationMode.valueOfStringKey(mode.getStringKey(), null);
if (savedMode != null) {
ApplicationMode.changeProfileAvailability(savedMode, false, app);
}
} }
} }
} }
@ -185,11 +209,6 @@ public class CustomOsmandPlugin extends OsmandPlugin {
return R.drawable.contour_lines; return R.drawable.contour_lines;
} }
@Override
public int getLogoResourceId() {
return R.drawable.ic_action_skiing;
}
public void readAdditionalDataFromJson(JSONObject json) throws JSONException { public void readAdditionalDataFromJson(JSONObject json) throws JSONException {
JSONObject nameJson = json.has("name") ? json.getJSONObject("name") : null; JSONObject nameJson = json.has("name") ? json.getJSONObject("name") : null;
if (nameJson != null) { if (nameJson != null) {

6
OsmAnd/src/net/osmand/plus/SettingsHelper.java
View file

@ -1660,9 +1660,11 @@ public class SettingsHelper {
@Override @Override
void writeItemsToJson(@NonNull JSONObject json) { void writeItemsToJson(@NonNull JSONObject json) {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
if (!items.isEmpty()) { if (!items.isEmpty() || !duplicateItems.isEmpty()) {
List<ITileSource> templates = new ArrayList<>(items);
templates.addAll(duplicateItems);
try { try {
for (ITileSource template : items) { for (ITileSource template : templates) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
boolean sql = template instanceof SQLiteTileSource; boolean sql = template instanceof SQLiteTileSource;
jsonObject.put("sql", sql); jsonObject.put("sql", sql);