diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2011-11-15 19:08:40 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2011-11-15 19:08:40 +0100 |
| commit | d52238fdbc20aefec62edb384e548172d5999b2b (patch) | |
| tree | 0840a49f913208d64f40dd0f97377574a24b8b8f /main/src | |
| parent | cc8cd8438ad71a1315175dd2ac5c0a72c37c51c1 (diff) | |
| download | cgeo-d52238fdbc20aefec62edb384e548172d5999b2b.zip cgeo-d52238fdbc20aefec62edb384e548172d5999b2b.tar.gz cgeo-d52238fdbc20aefec62edb384e548172d5999b2b.tar.bz2 | |
new: allow offline log without any login data stored, fixes #793
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/VisitCacheActivity.java | 8 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/activity/ActivityMixin.java | 22 |
2 files changed, 18 insertions, 12 deletions
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java index 3b8b3e1..022209f 100644 --- a/main/src/cgeo/geocaching/VisitCacheActivity.java +++ b/main/src/cgeo/geocaching/VisitCacheActivity.java @@ -616,10 +616,18 @@ public class VisitCacheActivity extends cgLogForm { finish(); return; } + if (!Settings.isLogin()) { // allow offline logging + showToast(res.getString(R.string.err_login)); + return; + } } @Override public void run() { + if (!Settings.isLogin()) { + // enable only offline logging, don't get the current state of the cache + return; + } final Parameters params = new Parameters(); gettingViewstate = true; diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java index 5561cc7..37a4930 100644 --- a/main/src/cgeo/geocaching/activity/ActivityMixin.java +++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java @@ -134,19 +134,17 @@ public final class ActivityMixin { return; } Resources res = ((Activity) activity).getResources(); - if (Settings.isLogin()) { - if (Settings.getLogOffline()) { - SubMenu logMenu = menu.addSubMenu(1, IAbstractActivity.MENU_LOG_VISIT_OFFLINE, 0, res.getString(R.string.cache_menu_visit_offline)).setIcon(MENU_ICON_LOG_VISIT); - List<Integer> logTypes = cache.getPossibleLogTypes(); - for (Integer logType : logTypes) { - String label = cgBase.logTypes2.get(logType); - logMenu.add(1, IAbstractActivity.MENU_LOG_VISIT_OFFLINE + logType, 0, label); - } - logMenu.add(1, IAbstractActivity.MENU_LOG_VISIT, 0, res.getString(R.string.cache_menu_visit)); - } - else { - menu.add(1, IAbstractActivity.MENU_LOG_VISIT, 0, res.getString(R.string.cache_menu_visit)).setIcon(MENU_ICON_LOG_VISIT); + if (Settings.getLogOffline()) { + SubMenu logMenu = menu.addSubMenu(1, IAbstractActivity.MENU_LOG_VISIT_OFFLINE, 0, res.getString(R.string.cache_menu_visit_offline)).setIcon(MENU_ICON_LOG_VISIT); + List<Integer> logTypes = cache.getPossibleLogTypes(); + for (Integer logType : logTypes) { + String label = cgBase.logTypes2.get(logType); + logMenu.add(1, IAbstractActivity.MENU_LOG_VISIT_OFFLINE + logType, 0, label); } + logMenu.add(1, IAbstractActivity.MENU_LOG_VISIT, 0, res.getString(R.string.cache_menu_visit)); + } + else { + menu.add(1, IAbstractActivity.MENU_LOG_VISIT, 0, res.getString(R.string.cache_menu_visit)).setIcon(MENU_ICON_LOG_VISIT); } } } |