diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-10 13:52:47 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-10 13:52:47 +0200 |
| commit | f969d3196b9b62181387ae1dc2522e7742e8e968 (patch) | |
| tree | 24a956b92d30be16cc9c2c89df116c786f2301f0 /main | |
| parent | 15be638f2294579a722f0cba9a4dcd8d9db6772d (diff) | |
| parent | 49088ff6510cabd944755cb4a792f897f46c3e4b (diff) | |
| download | cgeo-f969d3196b9b62181387ae1dc2522e7742e8e968.zip cgeo-f969d3196b9b62181387ae1dc2522e7742e8e968.tar.gz cgeo-f969d3196b9b62181387ae1dc2522e7742e8e968.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/src/cgeo/geocaching/connector/gc/GCParser.java
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 5 |
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) { |