refactoring: generalize GCConnector capabilities implementation

2 files changed, 6 insertions, 14 deletions

diff --git a/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java
index d070d71..3874b47 100644
--- a/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/CoordsGeocacheListLoader.java
@@ -1,18 +1,18 @@
 package cgeo.geocaching.loaders;
 
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.capability.ISearchByCenter;
-import cgeo.geocaching.connector.gc.GCParser;
 import cgeo.geocaching.geopoint.Geopoint;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import android.content.Context;
 
 public class CoordsGeocacheListLoader extends AbstractSearchLoader {
-    private final Geopoint coords;
+    private final @NonNull Geopoint coords;
 
-    public CoordsGeocacheListLoader(Context context, Geopoint coords) {
+    public CoordsGeocacheListLoader(final Context context, final @NonNull Geopoint coords) {
         super(context);
         this.coords = coords;
     }
@@ -21,13 +21,10 @@ public class CoordsGeocacheListLoader extends AbstractSearchLoader {
     public SearchResult runSearch() {
 
         SearchResult search = new SearchResult();
-        if (Settings.isGCConnectorActive()) {
-            search = GCParser.searchByCoords(coords, Settings.getCacheType(), Settings.isShowCaptcha(), this);
-        }
 
         for (ISearchByCenter centerConn : ConnectorFactory.getSearchByCenterConnectors()) {
             if (centerConn.isActive()) {
-                search.addSearchResult(centerConn.searchByCenter(coords));
+                search.addSearchResult(centerConn.searchByCenter(coords, this));
             }
         }
 
diff --git a/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java
index 0d8fcb1..c8deb59 100644
--- a/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java
+++ b/main/src/cgeo/geocaching/loaders/KeywordGeocacheListLoader.java
@@ -3,8 +3,6 @@ package cgeo.geocaching.loaders;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.capability.ISearchByKeyword;
-import cgeo.geocaching.connector.gc.GCParser;
-import cgeo.geocaching.settings.Settings;
 
 import android.content.Context;
 
@@ -20,13 +18,10 @@ public class KeywordGeocacheListLoader extends AbstractSearchLoader {
     @Override
     public SearchResult runSearch() {
         SearchResult searchResult = new SearchResult();
-        if (Settings.isGCConnectorActive()) {
-            searchResult = GCParser.searchByKeyword(keyword, Settings.getCacheType(), Settings.isShowCaptcha(), this);
-        }
 
         for (ISearchByKeyword connector : ConnectorFactory.getSearchByKeywordConnectors()) {
             if (connector.isActive()) {
-                searchResult.addSearchResult(connector.searchByName(keyword));
+                searchResult.addSearchResult(connector.searchByKeyword(keyword, this));
             }
         }