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

Remove unnecessary changes

Browse source
This commit is contained in:
Vitaliy 2020-04-09 17:25:30 +03:00
parent e1f56f6915
commit 70c907c010
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -402,27 +402,22 @@ public class SettingsHelper {
@Override @Override
public void apply() { public void apply() {
if (shouldReplace || !exists()) { if (shouldReplace || !exists()) {
OsmandPlugin.addCustomPlugin(app, plugin);
}
CustomOsmandPlugin customPlugin = (CustomOsmandPlugin) OsmandPlugin.getPlugin(getPluginId());
updatePluginItems(customPlugin);
}
private void updatePluginItems(CustomOsmandPlugin customPlugin) {
for (SettingsHelper.SettingsItem item : pluginDependentItems) { for (SettingsHelper.SettingsItem item : pluginDependentItems) {
if (item instanceof SettingsHelper.FileSettingsItem) { if (item instanceof SettingsHelper.FileSettingsItem) {
FileSettingsItem fileItem = (FileSettingsItem) item; FileSettingsItem fileItem = (FileSettingsItem) item;
if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.RENDERING_STYLE) { if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.RENDERING_STYLE) {
customPlugin.addRenderer(fileItem.getName()); plugin.addRenderer(fileItem.getName());
} else if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.ROUTING_CONFIG) { } else if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.ROUTING_CONFIG) {
customPlugin.addRouter(fileItem.getName()); plugin.addRouter(fileItem.getName());
} else if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.OTHER) { } else if (fileItem.getSubtype() == FileSettingsItem.FileSubtype.OTHER) {
customPlugin.setResourceDirName(item.getFileName()); plugin.setResourceDirName(item.getFileName());
} }
} else if (item instanceof SuggestedDownloadsItem) { } else if (item instanceof SuggestedDownloadsItem) {
customPlugin.updateSuggestedDownloads(((SuggestedDownloadsItem) item).items); plugin.updateSuggestedDownloads(((SuggestedDownloadsItem) item).getItems());
} }
} }
OsmandPlugin.addCustomPlugin(app, plugin);
}
} }
@Override @Override