From ae74d5c6f1a9f7bc0e90c8e6405745acd01ad5ef Mon Sep 17 00:00:00 2001 From: Portree-Kid Date: Wed, 17 Oct 2012 20:03:24 +0200 Subject: Changed saving of Map-Mode * Live map starts in last LiveMapMode, persists on exit * Other maps always start in non-live mode, switch possible, CurrentMapMode not persisted Closes #1990 --- main/src/cgeo/geocaching/maps/CGeoMap.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index fb366c8..46436bb 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -350,7 +350,14 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto public void onSaveInstanceState(final Bundle outState) { outState.putInt(BUNDLE_MAP_SOURCE, currentSourceId); outState.putIntArray(BUNDLE_MAP_STATE, currentMapState()); - outState.putString(BUNDLE_MAP_MODE, mapMode.name()); + if (isLiveMode()) + { + outState.putString(BUNDLE_MAP_MODE, mapMode.name()); + } + else + { + outState.putString(BUNDLE_MAP_MODE, null); + } } @Override @@ -392,7 +399,10 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto if (savedInstanceState != null) { currentSourceId = savedInstanceState.getInt(BUNDLE_MAP_SOURCE, Settings.getMapSource()); mapStateIntent = savedInstanceState.getIntArray(BUNDLE_MAP_STATE); - mapMode = Enum.valueOf(MapMode.class, savedInstanceState.getString(BUNDLE_MAP_MODE)); + if (savedInstanceState.getString(BUNDLE_MAP_MODE) != null) + { + mapMode = Enum.valueOf(MapMode.class, savedInstanceState.getString(BUNDLE_MAP_MODE)); + } Settings.setLiveMap(mapMode == MapMode.LIVE_ONLINE); } else { -- cgit v1.1 From ffbb916bbd2b414a71eea44055dbe555a28594b8 Mon Sep 17 00:00:00 2001 From: Portree-Kid Date: Sun, 21 Oct 2012 12:00:23 +0200 Subject: Fixed bracket placing and double calculated value. --- main/src/cgeo/geocaching/maps/CGeoMap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 46436bb..b0cb352 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -399,9 +399,9 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto if (savedInstanceState != null) { currentSourceId = savedInstanceState.getInt(BUNDLE_MAP_SOURCE, Settings.getMapSource()); mapStateIntent = savedInstanceState.getIntArray(BUNDLE_MAP_STATE); - if (savedInstanceState.getString(BUNDLE_MAP_MODE) != null) - { - mapMode = Enum.valueOf(MapMode.class, savedInstanceState.getString(BUNDLE_MAP_MODE)); + String lastMapmode = savedInstanceState.getString(BUNDLE_MAP_MODE); + if (lastMapmode != null) { + mapMode = Enum.valueOf(MapMode.class, lastMapmode); } Settings.setLiveMap(mapMode == MapMode.LIVE_ONLINE); -- cgit v1.1 From 21fa1ad1689249965b49f6ec91adac7f257e52ed Mon Sep 17 00:00:00 2001 From: Portree-Kid Date: Sun, 21 Oct 2012 12:02:23 +0200 Subject: Fixed bracket placing --- main/src/cgeo/geocaching/maps/CGeoMap.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index b0cb352..a2848ae 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -350,12 +350,10 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto public void onSaveInstanceState(final Bundle outState) { outState.putInt(BUNDLE_MAP_SOURCE, currentSourceId); outState.putIntArray(BUNDLE_MAP_STATE, currentMapState()); - if (isLiveMode()) - { + if (isLiveMode()) { outState.putString(BUNDLE_MAP_MODE, mapMode.name()); } - else - { + else { outState.putString(BUNDLE_MAP_MODE, null); } } -- cgit v1.1