diff options
| author | Mathieu Alorent <github@kumy.net> | 2015-09-27 22:37:00 +0200 |
|---|---|---|
| committer | Mathieu Alorent <github@kumy.net> | 2015-09-27 22:46:22 +0200 |
| commit | bcbc964c711e40c747c439c010b5d919c49bbd5f (patch) | |
| tree | eb65433f7c571f39d4b10f2b00107a2d7d736bf1 | |
| parent | 3fda518e5b40bd7cc36585f812f60100f5f75476 (diff) | |
| download | cgeo-bcbc964c711e40c747c439c010b5d919c49bbd5f.zip cgeo-bcbc964c711e40c747c439c010b5d919c49bbd5f.tar.gz cgeo-bcbc964c711e40c747c439c010b5d919c49bbd5f.tar.bz2 | |
Fix #5209: prevent wrong requests to geokrety
| -rw-r--r-- | main/res/values/changelog_release.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/LogCacheActivity.java | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 1459664..a066b40 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -5,6 +5,7 @@ <b>Next release</b>\n · Fix: Crash invoking Maps.me with waypoints without coordinates\n · Fix: spoiler image descriptions were missing\n + · Fix: Prevent wrong requests to geokrety.org\n \n \n <b>2015.09.23:</b>\n diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java index 99e472f..c322a32 100644 --- a/main/src/cgeo/geocaching/LogCacheActivity.java +++ b/main/src/cgeo/geocaching/LogCacheActivity.java @@ -312,6 +312,12 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia AppObservable.bindActivity(this, // Obtain the actives connectors Observable.from(ConnectorFactory.getGenericTrackablesConnectors()) + .filter(new Func1<TrackableConnector, Boolean>() { + @Override + public Boolean call(final TrackableConnector trackableConnector) { + return trackableConnector.isRegistered(); + } + }) .flatMap(new Func1<TrackableConnector, Observable<TrackableLog>>() { @Override public Observable<TrackableLog> call(final TrackableConnector trackableConnector) { diff --git a/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java b/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java index 829f67b..c4ec640 100644 --- a/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java +++ b/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java @@ -130,6 +130,9 @@ public class GeokretyConnector extends AbstractTrackableConnector { // retrieve someone inventory params.put("userid", String.valueOf(userid)); } else { + if (StringUtils.isBlank(Settings.getGeokretySecId())) { + return Collections.emptyList(); + } // Retrieve inventory, with tracking codes params.put("secid", Settings.getGeokretySecId()); } |