diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2014-11-23 11:28:45 +0100 |
---|---|---|
committer | Samuel Tardieu <sam@rfc1149.net> | 2014-11-23 11:28:45 +0100 |
commit | f03e4b447610caa556c972345081fca9f5a04795 (patch) | |
tree | 34431e737b790e24997634523a1f039af59ff7fb /main/src | |
parent | 69c925e5a34b1eeb8de123858dbb7467045e6712 (diff) | |
download | cgeo-f03e4b447610caa556c972345081fca9f5a04795.zip cgeo-f03e4b447610caa556c972345081fca9f5a04795.tar.gz cgeo-f03e4b447610caa556c972345081fca9f5a04795.tar.bz2 |
Remove always true parameter
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 3c01718..e7b7f92 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -832,14 +832,12 @@ public abstract class GCParser { /** * Possibly hide caches found or hidden by user. This mutates its params argument when possible. * - * @param params - * the parameters to mutate, or null to create a new Parameters if needed - * @param my - * @param addF + * @param params the parameters to mutate, or null to create a new Parameters if needed + * @param my {@code true} if the user's caches must be forcibly included regardless of their settings * @return the original params if not null, maybe augmented with f=1, or a new Parameters with f=1 or null otherwise */ - private static Parameters addFToParams(final Parameters params, final boolean my, final boolean addF) { - if (!my && Settings.isExcludeMyCaches() && addF) { + private static Parameters addFToParams(final Parameters params, final boolean my) { + if (!my && Settings.isExcludeMyCaches()) { if (params == null) { return new Parameters("f", "1"); } @@ -855,8 +853,9 @@ public abstract class GCParser { insertCacheType(params, cacheType); final String uri = "http://www.geocaching.com/seek/nearest.aspx"; - final String fullUri = uri + "?" + addFToParams(params, my, true); - final String page = GCLogin.getInstance().getRequestLogged(uri, addFToParams(params, my, true)); + final Parameters paramsWithF = addFToParams(params, my); + final String fullUri = uri + "?" + paramsWithF; + final String page = GCLogin.getInstance().getRequestLogged(uri, paramsWithF); if (StringUtils.isBlank(page)) { Log.e("GCParser.searchByAny: No data from server"); |