From 7a6d90d0ce29acd65754947c9a94afb35637831f Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 26 Feb 2015 21:33:41 +0100
Subject: fix some findbugs issues

---
 main/src/cgeo/geocaching/apps/AbstractApp.java           | 4 ++++
 main/src/cgeo/geocaching/connector/oc/OCCZConnector.java | 2 +-
 main/src/cgeo/geocaching/maps/CGeoMap.java               | 2 +-
 main/src/cgeo/geocaching/utils/ProcessUtils.java         | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/src/cgeo/geocaching/apps/AbstractApp.java b/main/src/cgeo/geocaching/apps/AbstractApp.java
index fa052f1..3bc7f71 100644
--- a/main/src/cgeo/geocaching/apps/AbstractApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractApp.java
@@ -38,6 +38,10 @@ public abstract class AbstractApp implements App {
         if (StringUtils.isNotEmpty(packageName) && ProcessUtils.isLaunchable(packageName)) {
             return true;
         }
+        if (intent == null) {
+            return false;
+        }
+        assert intent != null; // eclipse issue
         return ProcessUtils.isIntentAvailable(intent);
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java b/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java
index f1ece61..ee4330a 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java
@@ -22,7 +22,7 @@ public class OCCZConnector extends OCConnector {
         }
         final String id = StringUtils.substringAfter(url, "cacheid=");
         try {
-            final String geocode = GEOCODE_PREFIX + StringUtils.leftPad(Integer.toHexString(Integer.valueOf(id)), 4, '0');
+            final String geocode = GEOCODE_PREFIX + StringUtils.leftPad(Integer.toHexString(Integer.parseInt(id)), 4, '0');
             if (canHandle(geocode)) {
                 return geocode;
             }
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index fd08adb..ed938bd 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -464,7 +464,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
         mapView.getMapController().setCenter(Settings.getMapCenter());
 
         if (null == mapStateIntent) {
-            followMyLocation &= mapMode == MapMode.LIVE;
+            followMyLocation = followMyLocation && (mapMode == MapMode.LIVE);
         } else {
             followMyLocation = 1 == mapStateIntent[3];
             if ((overlayCaches.getCircles() ? 1 : 0) != mapStateIntent[4]) {
diff --git a/main/src/cgeo/geocaching/utils/ProcessUtils.java b/main/src/cgeo/geocaching/utils/ProcessUtils.java
index d04c1fe..6a57cbf 100644
--- a/main/src/cgeo/geocaching/utils/ProcessUtils.java
+++ b/main/src/cgeo/geocaching/utils/ProcessUtils.java
@@ -70,7 +70,7 @@ public final class ProcessUtils {
         }
     }
 
-    public static boolean isIntentAvailable(final String intent) {
+    public static boolean isIntentAvailable(@NonNull final String intent) {
         return isIntentAvailable(intent, null);
     }
 
-- 
cgit v1.1