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

Fix crash

Browse source
This commit is contained in:
Victor Shcherb 2020-03-22 17:34:03 +01:00
parent adf9026d78
commit c7133059fb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
View file

@ -78,8 +78,6 @@ public class QuickActionRegistry {
public QuickActionRegistry(OsmandSettings settings) {
this.settings = settings;
quickActions = parseActiveActionsList(settings.QUICK_ACTION_LIST.get());
fabStateMap = getQuickActionFabStateMapFromJson(settings.QUICK_ACTION.get());
gson = new GsonBuilder().registerTypeAdapter(QuickAction.class, new JsonSerializer<QuickAction>() {
@Override
public JsonElement serialize(QuickAction src, Type typeOfSrc, JsonSerializationContext context) {
@ -97,7 +95,7 @@ public class QuickActionRegistry {
@Override
public QuickAction deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
JsonObject obj = json.getAsJsonObject();
// TODO iteration
// TODO improve search iteration
List<QuickActionType> types = QuickActionRegistry.getActionTypes();
QuickActionType found = null;
if(obj.has("actionType")) {
@ -136,6 +134,8 @@ public class QuickActionRegistry {
return null;
}
}).create();
quickActions = parseActiveActionsList(settings.QUICK_ACTION_LIST.get());
fabStateMap = getQuickActionFabStateMapFromJson(settings.QUICK_ACTION.get());
}