aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-06-05 17:58:34 +0200
committerSamuel Tardieu <sam@rfc1149.net>2012-06-05 17:58:34 +0200
commit03dfe06f1994f27dcdc01038f4b8afb7fae4e246 (patch)
tree507e5b15ecca6f8d465fc170db7b993563fc38cc
parent9c3a0c67b5f64958b7de76dc2b40c552ceb8f735 (diff)
downloadcgeo-03dfe06f1994f27dcdc01038f4b8afb7fae4e246.zip
cgeo-03dfe06f1994f27dcdc01038f4b8afb7fae4e246.tar.gz
cgeo-03dfe06f1994f27dcdc01038f4b8afb7fae4e246.tar.bz2
Fix #1698: show live map warning only once per session
-rw-r--r--main/src/cgeo/geocaching/cgeoapplication.java9
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java3
2 files changed, 11 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index fd54590..0860930 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -42,6 +42,7 @@ public class cgeoapplication extends Application {
public boolean firstRun = true; // c:geo is just launched
public boolean showLoginToast = true; //login toast shown just once.
private boolean databaseCleaned = false; // database was cleaned
+ private boolean liveMapHintShown = false; // livemap hint has been shown
final private StatusUpdater statusUpdater = new StatusUpdater();
private static cgeoapplication instance = null;
@@ -493,4 +494,12 @@ public class cgeoapplication extends Application {
return storage.loadWaypoints(viewport, excludeMine, excludeDisabled);
}
+ public boolean isLiveMapHintShown() {
+ return liveMapHintShown;
+ }
+
+ public void setLiveMapHintShown() {
+ liveMapHintShown = true;
+ }
+
}
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 2f99dd5..f6a5a8b 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -451,9 +451,10 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
prepareFilterBar();
- if (!Settings.getHideLiveMapHint()) {
+ if (!app.isLiveMapHintShown() && !Settings.getHideLiveMapHint()) {
Intent hintIntent = new Intent(activity, LiveMapInfo.class);
activity.startActivity(hintIntent);
+ app.setLiveMapHintShown();
}
}