12 files changed, 18 insertions, 18 deletions
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index f025bd5..25bfef4 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -2853,7 +2853,7 @@ public class cgBase {
         }
     }
 
-    public static HttpResponse request(final String uri, final Parameters params, final Boolean xContentType) {
+    public static HttpResponse request(final String uri, final Parameters params, final boolean xContentType) {
         final String fullUri = params == null ? uri : Uri.parse(uri).buildUpon().encodedQuery(params.toString()).build().toString();
         final HttpRequestBase request = new HttpGet(fullUri);
 
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 74dad21..b02c029 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -48,7 +48,7 @@ public class cgCache implements ICache {
     private Long detailedUpdate = null;
     private Long visitedDate = null;
     private Integer reason = 0;
-    private Boolean detailed = false;
+    private boolean detailed = false;
     private String geocode = "";
     private String cacheId = "";
     private String guid = "";
@@ -629,11 +629,11 @@ public class cgCache implements ICache {
         this.reason = reason;
     }
 
-    public Boolean getDetailed() {
+    public boolean getDetailed() {
         return detailed;
     }
 
-    public void setDetailed(Boolean detailed) {
+    public void setDetailed(boolean detailed) {
         this.detailed = detailed;
     }
 
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index 9ca30a3..486665a 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -200,11 +200,11 @@ public class cgeoapplication extends Application {
         databaseCleaned = true;
     }
 
-    public Boolean isThere(String geocode, String guid, boolean detailed, boolean checkTime) {
+    public boolean isThere(String geocode, String guid, boolean detailed, boolean checkTime) {
         return getStorage().isThere(geocode, guid, detailed, checkTime);
     }
 
-    public Boolean isOffline(String geocode, String guid) {
+    public boolean isOffline(String geocode, String guid) {
         return getStorage().isOffline(geocode, guid);
     }
 
diff --git a/main/src/cgeo/geocaching/cgeodetail.java b/main/src/cgeo/geocaching/cgeodetail.java
index c2e0061..84c208b 100644
--- a/main/src/cgeo/geocaching/cgeodetail.java
+++ b/main/src/cgeo/geocaching/cgeodetail.java
@@ -96,7 +96,7 @@ public class cgeodetail extends AbstractActivity {
     private TextView cacheDistance = null;
     private String contextMenuUser = null;
     private Spanned longDesc = null;
-    private Boolean longDescDisplayed = false;
+    private boolean longDescDisplayed = false;
     private loadCache threadCache = null;
     private loadLongDesc threadLongDesc = null;
     private Thread storeThread = null;
diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index 136c6b9..1f270a7 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
 
 public class cgeopopup extends AbstractActivity {
 
-    private Boolean fromDetail = false;
+    private boolean fromDetail = false;
     private LayoutInflater inflater = null;
     private String geocode = null;
     private cgCache cache = null;
diff --git a/main/src/cgeo/geocaching/cgeotouch.java b/main/src/cgeo/geocaching/cgeotouch.java
index 372f666..9fb0c1a 100644
--- a/main/src/cgeo/geocaching/cgeotouch.java
+++ b/main/src/cgeo/geocaching/cgeotouch.java
@@ -33,7 +33,7 @@ public class cgeotouch extends cgLogForm {
     private String guid = null;
     private String geocode = null;
     private String[] viewstates = null;
-    private Boolean gettingViewstate = true;
+    private boolean gettingViewstate = true;
     private Calendar date = Calendar.getInstance();
     private int typeSelected = -1;
     private int attempts = 0;
diff --git a/main/src/cgeo/geocaching/cgeovisit.java b/main/src/cgeo/geocaching/cgeovisit.java
index 34084aa..a07dfeb 100644
--- a/main/src/cgeo/geocaching/cgeovisit.java
+++ b/main/src/cgeo/geocaching/cgeovisit.java
@@ -50,7 +50,7 @@ public class cgeovisit extends cgLogForm {
     private String text = null;
     private boolean alreadyFound = false;
     private String[] viewstates = null;
-    private Boolean gettingViewstate = true;
+    private boolean gettingViewstate = true;
     private List<cgTrackableLog> trackables = null;
     private Calendar date = Calendar.getInstance();
     private int typeSelected = 1;
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 9e07e5b..c1901de 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -424,7 +424,7 @@ public abstract class GPXParser extends FileParser {
 
             @Override
             public void end(String watchList) {
-                cache.setOnWatchlist(Boolean.valueOf(watchList.trim()));
+                cache.setOnWatchlist(Boolean.valueOf(watchList.trim()).booleanValue());
             }
         });
 
diff --git a/main/src/cgeo/geocaching/maps/CachesOverlay.java b/main/src/cgeo/geocaching/maps/CachesOverlay.java
index ba091db..40da6f2 100644
--- a/main/src/cgeo/geocaching/maps/CachesOverlay.java
+++ b/main/src/cgeo/geocaching/maps/CachesOverlay.java
@@ -42,7 +42,7 @@ public class CachesOverlay extends AbstractItemizedOverlay {
 
     private List<CachesOverlayItemImpl> items = new ArrayList<CachesOverlayItemImpl>();
     private Context context = null;
-    private Boolean fromDetail = false;
+    private boolean fromDetail = false;
     private boolean displayCircles = false;
     private ProgressDialog waitDialog = null;
     private Point center = new Point();
@@ -52,7 +52,7 @@ public class CachesOverlay extends AbstractItemizedOverlay {
     private PaintFlagsDrawFilter remfil = null;
     private MapFactory mapFactory = null;
 
-    public CachesOverlay(ItemizedOverlayImpl ovlImpl, Context contextIn, Boolean fromDetailIn) {
+    public CachesOverlay(ItemizedOverlayImpl ovlImpl, Context contextIn, boolean fromDetailIn) {
         super(ovlImpl);
 
         populate();
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
index 95b97c2..bdd4500 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
@@ -27,7 +27,7 @@ public class GoogleCacheOverlay extends ItemizedOverlay<GoogleCacheOverlayItem>
     private CachesOverlay base;
     private Lock lock = new ReentrantLock();
 
-    public GoogleCacheOverlay(Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
+    public GoogleCacheOverlay(Context contextIn, Drawable markerIn, boolean fromDetailIn) {
         super(boundCenterBottom(markerIn));
         base = new CachesOverlay(this, contextIn, fromDetailIn);
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlay.java
index 1321720..76402d4 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlay.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlay.java
@@ -21,7 +21,7 @@ public class MapsforgeCacheOverlay extends ItemizedOverlay<MapsforgeCacheOverlay
     private CachesOverlay base;
     private Lock lock = new ReentrantLock();
 
-    public MapsforgeCacheOverlay(Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
+    public MapsforgeCacheOverlay(Context contextIn, Drawable markerIn, boolean fromDetailIn) {
         super(boundCenterBottom(markerIn));
         base = new CachesOverlay(this, contextIn, fromDetailIn);
     }
diff --git a/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java b/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java
index 8293b7d..00593a0 100644
--- a/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java
+++ b/main/src/gnu/android/app/appmanualclient/AppManualReaderClient.java
@@ -1,7 +1,5 @@
 package gnu.android.app.appmanualclient;
 
-import java.util.List;
-
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -11,6 +9,8 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.util.Log;
 
+import java.util.List;
+
 /**
  * The "App Manual Reader" client is a class to be used in applications which
  * want to offer their users manuals through the gnu.android.appmanualreader
@@ -200,7 +200,7 @@ public class AppManualReaderClient {
 	 *                {@literal fallbackUri} was given.
 	 */
 	public static void openManual(String manualIdentifier, String topic,
-			Context context, String fallbackUri, Boolean contextAffinity)
+            Context context, String fallbackUri, boolean contextAffinity)
 			throws ActivityNotFoundException {
 		//
 		// The path of an "appmanual:" URI consists simply of the locale