diff options
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index c637579..c8473a5 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -826,6 +826,15 @@ public abstract class GCParser { return searchByAny(cacheType, false, showCaptcha, params, recaptchaReceiver); } + 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 my; + } + public static SearchResult searchByUsername(final String userName, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) { if (StringUtils.isBlank(userName)) { Log.e("GCParser.searchByUsername: No user name given"); @@ -834,13 +843,7 @@ public abstract class GCParser { final Parameters params = new Parameters("ul", userName); - boolean my = false; - if (userName.equalsIgnoreCase(Settings.getLogin().left)) { - my = true; - Log.i("GCParser.searchByUsername: Overriding users choice, downloading all caches."); - } - - return searchByAny(cacheType, my, showCaptcha, params, recaptchaReceiver); + return searchByAny(cacheType, isSearchForMyCaches(userName), showCaptcha, params, recaptchaReceiver); } public static SearchResult searchByOwner(final String userName, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) { @@ -850,7 +853,7 @@ public abstract class GCParser { } final Parameters params = new Parameters("u", userName); - return searchByAny(cacheType, false, showCaptcha, params, recaptchaReceiver); + return searchByAny(cacheType, isSearchForMyCaches(userName), showCaptcha, params, recaptchaReceiver); } public static SearchResult searchByAddress(final String address, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) { |