Merge branch 'issue-4287' into upstream

4 files changed, 6 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 4089894..8bf64dc 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -523,7 +523,7 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     public boolean supportsFavoritePoints() {
-        return getConnector().supportsFavoritePoints();
+        return getConnector().supportsFavoritePoints(this);
     }
 
     public boolean supportsLogging() {
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 8138e96..a929e2b 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -76,7 +76,7 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public boolean supportsFavoritePoints() {
+    public boolean supportsFavoritePoints(final Geocache cache) {
         return false;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/IConnector.java b/main/src/cgeo/geocaching/connector/IConnector.java
index fbade5a..e6b6674 100644
--- a/main/src/cgeo/geocaching/connector/IConnector.java
+++ b/main/src/cgeo/geocaching/connector/IConnector.java
@@ -72,7 +72,7 @@ public interface IConnector {
      *
      * @return
      */
-    public boolean supportsFavoritePoints();
+    public boolean supportsFavoritePoints(final Geocache cache);
 
     /**
      * enable/disable logging controls in cache details
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 2a3d7b0..9bb6f21 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -20,6 +20,7 @@ import cgeo.geocaching.connector.capability.ISearchByGeocode;
 import cgeo.geocaching.connector.capability.ISearchByKeyword;
 import cgeo.geocaching.connector.capability.ISearchByOwner;
 import cgeo.geocaching.connector.capability.ISearchByViewPort;
+import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
@@ -285,8 +286,8 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
     }
 
     @Override
-    public boolean supportsFavoritePoints() {
-        return true;
+    public boolean supportsFavoritePoints(final Geocache cache) {
+        return cache.getType() != CacheType.CITO;
     }
 
     @Override