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

Add warnings to settings items

Browse source
This commit is contained in:
Vitaliy 2020-04-03 17:07:41 +03:00
parent 5d65373647
commit 649f7e594b
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values/strings.xml
View file

@ -11,6 +11,9 @@
Thx - Hardy
-->
<string name="settings_item_import_error">Could not import %1$s.</string>
<string name="settings_item_write_error">Could not write %1$s.</string>
<string name="settings_item_read_error">Could not read %1$s.</string>
<string name="custom_osmand_plugin">Custom OsmAnd plugin</string>
<string name="app_mode_ski_snowmobile">Snowmobile</string>
<string name="app_mode_ski_touring">Ski touring</string>

2
OsmAnd/src/net/osmand/plus/OsmandPlugin.java
View file

@ -789,7 +789,7 @@ public abstract class OsmandPlugin {
}
public static void registerQuickActionTypesPlugins(List<QuickActionType> quickActionTypes) {
for (OsmandPlugin p : getAvailablePlugins()) {
for (OsmandPlugin p : getEnabledPlugins()) {
quickActionTypes.addAll(p.getQuickActionTypes());
}
}

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

@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import net.osmand.AndroidUtils;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
@ -142,6 +143,8 @@ public class SettingsHelper {
boolean shouldReplace = false;
protected List<String> warnings;
SettingsItem(OsmandApplication app) {
this.app = app;
init();
@ -149,6 +152,7 @@ public class SettingsHelper {
SettingsItem(OsmandApplication app, @NonNull JSONObject json) throws JSONException {
this.app = app;
warnings = new ArrayList<>();
init();
readFromJson(json);
}
@ -157,6 +161,10 @@ public class SettingsHelper {
// override
}
public List<String> getWarnings() {
return warnings;
}
@NonNull
public abstract SettingsItemType getType();
@ -1256,6 +1264,7 @@ public class SettingsHelper {
try {
setInputStream(new FileInputStream(file));
} catch (FileNotFoundException e) {
warnings.add(app.getString(R.string.settings_item_read_error, file.getName()));
LOG.error("Failed to set input stream from file: " + file.getName(), e);
}
return super.getWriter();
@ -1428,9 +1437,12 @@ public class SettingsHelper {
}
quickAction.setParams(params);
items.add(quickAction);
} else {
warnings.add(app.getString(R.string.settings_item_read_error, name));
}
}
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_read_error, String.valueOf(getType())));
throw new IllegalArgumentException("Json parse error", e);
}
}
@ -1453,6 +1465,7 @@ public class SettingsHelper {
}
json.put("items", jsonArray);
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_write_error, String.valueOf(getType())));
LOG.error("Failed write to json", e);
}
}
@ -1574,6 +1587,7 @@ public class SettingsHelper {
items.add(filter);
}
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_read_error, String.valueOf(getType())));
throw new IllegalArgumentException("Json parse error", e);
}
}
@ -1595,6 +1609,7 @@ public class SettingsHelper {
}
json.put("items", jsonArray);
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_write_error, String.valueOf(getType())));
LOG.error("Failed write to json", e);
}
}
@ -1758,6 +1773,7 @@ public class SettingsHelper {
items.add(template);
}
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_read_error, String.valueOf(getType())));
throw new IllegalArgumentException("Json parse error", e);
}
}
@ -1792,6 +1808,7 @@ public class SettingsHelper {
json.put("items", jsonArray);
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_write_error, String.valueOf(getType())));
LOG.error("Failed write to json", e);
}
}
@ -1927,6 +1944,7 @@ public class SettingsHelper {
items.add(roadInfo);
}
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_read_error, String.valueOf(getType())));
throw new IllegalArgumentException("Json parse error", e);
}
}
@ -1946,6 +1964,7 @@ public class SettingsHelper {
}
json.put("items", jsonArray);
} catch (JSONException e) {
warnings.add(app.getString(R.string.settings_item_write_error, String.valueOf(getType())));
LOG.error("Failed write to json", e);
}
}
@ -2232,8 +2251,10 @@ public class SettingsHelper {
reader.readFromStream(ois);
}
} catch (IllegalArgumentException e) {
item.warnings.add(app.getString(R.string.settings_item_read_error, item.getName()));
LOG.error("Error reading item data: " + item.getName(), e);
} catch (IOException e) {
item.warnings.add(app.getString(R.string.settings_item_read_error, item.getName()));
LOG.error("Error reading item data: " + item.getName(), e);
} finally {
zis.closeEntry();
@ -2484,6 +2505,13 @@ public class SettingsHelper {
private void finishImport(@Nullable SettingsImportListener listener, boolean success, @NonNull List<SettingsItem> items) {
importTask = null;
List<String> warnings = new ArrayList<>();
for (SettingsItem item : items) {
warnings.addAll(item.getWarnings());
}
if (!warnings.isEmpty()) {
app.showToastMessage(AndroidUtils.formatWarnings(warnings).toString());
}
if (listener != null) {
listener.onSettingsImportFinished(success, items);
}