code cleanup as adviced by Findbugs

3 files changed, 16 insertions, 11 deletions

diff --git a/src/cgeo/geocaching/activity/ActivityMixin.java b/src/cgeo/geocaching/activity/ActivityMixin.java
index 68a4403..acbb405 100644
--- a/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -120,6 +120,9 @@ public final class ActivityMixin {
 	}
 
 	protected static void addVisitMenu(IAbstractActivity activity, Menu menu, cgCache cache) {
+		if (cache == null) {
+			return;
+		}
 		if (!cache.supportsLogging()) {
 			return;
 		}
diff --git a/src/cgeo/geocaching/cgeocaches.java b/src/cgeo/geocaching/cgeocaches.java
index 214969f..e8586cc 100644
--- a/src/cgeo/geocaching/cgeocaches.java
+++ b/src/cgeo/geocaching/cgeocaches.java
@@ -1260,17 +1260,17 @@ public class cgeocaches extends AbstractListActivity {
 		// https://code.google.com/p/android/issues/detail?id=7139
 		lastMenuInfo = info;
 
-		// create a searchId for a single cache (as if in details view)
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("geocode", cache.geocode);
-		Long singleSearchId = base.searchByGeocode(params, 0, false);
-
-		if (NavigationAppFactory.onMenuItemSelected(item, geo, this,
-				res, cache, singleSearchId, null, null)) {
-			return true;
-		}
-		
 		if (cache != null) {
+			// create a searchId for a single cache (as if in details view)
+			HashMap<String, String> params = new HashMap<String, String>();
+			params.put("geocode", cache.geocode);
+			Long singleSearchId = base.searchByGeocode(params, 0, false);
+	
+			if (NavigationAppFactory.onMenuItemSelected(item, geo, this,
+					res, cache, singleSearchId, null, null)) {
+				return true;
+			}
+		
 			int logType = id - MENU_LOG_VISIT_OFFLINE;
 			cache.logOffline(this, logType);
 		}
diff --git a/src/cgeo/geocaching/files/GPXParser.java b/src/cgeo/geocaching/files/GPXParser.java
index cc864ce..c239ca9 100644
--- a/src/cgeo/geocaching/files/GPXParser.java
+++ b/src/cgeo/geocaching/files/GPXParser.java
@@ -505,7 +505,9 @@ public abstract class GPXParser extends FileParser {
 			Log.e(cgSettings.tag, "Cannot parse .gpx file " + file.getAbsolutePath() + " as GPX " + version + ": could not parse XML - " + e.toString());
 		}
 		try {
-			fis.close();
+			if (fis != null) {
+				fis.close();
+			}
 		} catch (IOException e) {
 			Log.e(cgSettings.tag, "Error after parsing .gpx file " + file.getAbsolutePath() + " as GPX " + version + ": could not close file!");
 		}