Merge branch 'release' into upstream

Conflicts:
	main/src/cgeo/geocaching/connector/gc/GCParser.java

1 files changed, 2 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index c8473a5..c5b1983 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -827,12 +827,11 @@ public abstract class GCParser {
     }
 
     private static boolean isSearchForMyCaches(final String userName) {
-        boolean my = false;
         if (userName.equalsIgnoreCase(Settings.getLogin().left)) {
-            my = true;
             Log.i("Overriding users choice because of self search, downloading all caches.");
+            return true;
         }
-        return my;
+        return false;
     }
 
     public static SearchResult searchByUsername(final String userName, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) {