fix #1701: Offline logging does not work from cache details

2 files changed, 14 insertions, 11 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/GeneralAppsFactory.java b/main/src/cgeo/geocaching/apps/cache/GeneralAppsFactory.java
index 22ce677..98e7db8 100644
--- a/main/src/cgeo/geocaching/apps/cache/GeneralAppsFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/GeneralAppsFactory.java
@@ -31,14 +31,15 @@ public final class GeneralAppsFactory extends AbstractAppFactory {
 
     public static boolean onMenuItemSelected(final MenuItem item, Activity activity, cgCache cache) {
         final GeneralApp app = (GeneralApp) getAppFromMenuItem(item, apps);
-        if (app != null) {
-            try {
-                return app.invoke(activity, cache);
-            } catch (Exception e) {
-                Log.e("GeneralAppsFactory.onMenuItemSelected: " + e.toString());
-            }
+        if (app == null) {
+            return false;
+        }
+        try {
+            app.invoke(activity, cache);
+        } catch (Exception e) {
+            Log.e("GeneralAppsFactory.onMenuItemSelected: " + e.toString());
         }
-        return false;
+        return true;
     }
 
 }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
index 8219320..cd8fea4 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -224,8 +224,9 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      * @return
      */
     public static boolean onMenuItemSelected(final MenuItem item, Activity activity, cgCache cache) {
-        navigateCache(activity, cache, getAppFromMenuItem(item));
-        return true;
+        final App menuItem = getAppFromMenuItem(item);
+        navigateCache(activity, cache, menuItem);
+        return menuItem != null;
     }
 
     private static void navigateCache(Activity activity, cgCache cache, App app) {
@@ -236,8 +237,9 @@ public final class NavigationAppFactory extends AbstractAppFactory {
     }
 
     public static boolean onMenuItemSelected(final MenuItem item, Activity activity, cgWaypoint waypoint) {
-        navigateWaypoint(activity, waypoint, getAppFromMenuItem(item));
-        return true;
+        final App menuItem = getAppFromMenuItem(item);
+        navigateWaypoint(activity, waypoint, menuItem);
+        return menuItem != null;
     }
 
     private static void navigateWaypoint(Activity activity, cgWaypoint waypoint, App app) {