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

Issue #6524 - Quick Action crash after selecting empty Overlay/Underlay/Map Style actions - FIXED

Browse source
This commit is contained in:
madwasp79 2019-02-19 14:10:18 +02:00
parent d9bf5ca746
commit bb477d3272
3 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/quickaction/actions/MapOverlayAction.java
View file

@ -84,6 +84,7 @@ public class MapOverlayAction extends SwitchableAction<Pair<String, String>> {
OsmandSettings settings = activity.getMyApplication().getSettings();
List<Pair<String, String>> sources = loadListFromParams();
if(sources.size()>0) {
boolean showBottomSheetStyles = Boolean.valueOf(getParams().get(KEY_DIALOG));
if (showBottomSheetStyles) {
showChooseDialog(activity.getSupportFragmentManager());
@ -103,6 +104,7 @@ public class MapOverlayAction extends SwitchableAction<Pair<String, String>> {
executeWithParams(activity, nextSource.first);
}
}
}
@Override
public void executeWithParams(MapActivity activity, String params) {
@ -193,8 +195,7 @@ public class MapOverlayAction extends SwitchableAction<Pair<String, String>> {
@Override
public boolean fillParams(View root, MapActivity activity) {
super.fillParams(root, activity);
getParams().put(KEY_DIALOG, Boolean.toString(((SwitchCompat) root.findViewById(R.id.saveButton)).isChecked()));
return true;
return super.fillParams(root, activity);
}
}

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

@ -77,7 +77,7 @@ public class MapSourceAction extends SwitchableAction<Pair<String, String>> {
OsmandSettings settings = activity.getMyApplication().getSettings();
List<Pair<String, String>> sources = loadListFromParams();
if(sources.size()>0) {
boolean showBottomSheetStyles = Boolean.valueOf(getParams().get(KEY_DIALOG));
if (showBottomSheetStyles) {
showChooseDialog(activity.getSupportFragmentManager());
@ -97,6 +97,7 @@ public class MapSourceAction extends SwitchableAction<Pair<String, String>> {
executeWithParams(activity, nextSource.first);
}
}
}
@Override
public void executeWithParams(MapActivity activity, String params) {
@ -195,8 +196,7 @@ public class MapSourceAction extends SwitchableAction<Pair<String, String>> {
@Override
public boolean fillParams(View root, MapActivity activity) {
super.fillParams(root, activity);
getParams().put(KEY_DIALOG, Boolean.toString(((SwitchCompat) root.findViewById(R.id.saveButton)).isChecked()));
return true;
return super.fillParams(root, activity);
}
}

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

@ -82,7 +82,7 @@ public class MapUnderlayAction extends SwitchableAction<Pair<String, String>> {
OsmandSettings settings = activity.getMyApplication().getSettings();
List<Pair<String, String>> sources = loadListFromParams();
if(sources.size()>0) {
boolean showBottomSheetStyles = Boolean.valueOf(getParams().get(KEY_DIALOG));
if (showBottomSheetStyles) {
showChooseDialog(activity.getSupportFragmentManager());
@ -102,6 +102,7 @@ public class MapUnderlayAction extends SwitchableAction<Pair<String, String>> {
executeWithParams(activity, nextSource.first);
}
}
}
@Override
public void executeWithParams(MapActivity activity, String params) {
@ -196,8 +197,7 @@ public class MapUnderlayAction extends SwitchableAction<Pair<String, String>> {
@Override
public boolean fillParams(View root, MapActivity activity) {
super.fillParams(root, activity);
getParams().put(KEY_DIALOG, Boolean.toString(((SwitchCompat) root.findViewById(R.id.saveButton)).isChecked()));
return true;
return super.fillParams(root, activity);
}
}