Merge pull request #2893 from marco-jacob/fixPersonalNoteFinal

make personalNote multiline, upload on OK and merge on refresh

3 files changed, 23 insertions, 19 deletions

diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 83c1b6f..c034f49 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -31,30 +31,22 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public boolean supportsOwnCoordinates() {
+    public boolean supportsPersonalNote() {
         return false;
     }
 
-    /**
-     * Uploading modified coordinates to website
-     *
-     * @param cache
-     * @param wpt
-     * @return success
-     */
     @Override
-    public boolean uploadModifiedCoordinates(Geocache cache, Geopoint wpt) {
+    public boolean uploadPersonalNote(Geocache cache) {
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * Uploading personal note to website
-     *
-     * @param cache
-     * @return success
-     */
     @Override
-    public boolean uploadPersonalNote(Geocache cache) {
+    public boolean supportsOwnCoordinates() {
+        return false;
+    }
+
+    @Override
+    public boolean uploadModifiedCoordinates(Geocache cache, Geopoint wpt) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/main/src/cgeo/geocaching/connector/IConnector.java b/main/src/cgeo/geocaching/connector/IConnector.java
index c44b946..f629a28 100644
--- a/main/src/cgeo/geocaching/connector/IConnector.java
+++ b/main/src/cgeo/geocaching/connector/IConnector.java
@@ -144,11 +144,11 @@ public interface IConnector {
     public String getGeocodeFromUrl(final String url);
 
     /**
-     * enable/disable uploading modified coordinates to website
+     * enable/disable uploading personal note
      *
      * @return true, when uploading is possible
      */
-    public boolean supportsOwnCoordinates();
+    public boolean supportsPersonalNote();
 
     /**
      * Uploading personal note to website
@@ -159,7 +159,14 @@ public interface IConnector {
     public boolean uploadPersonalNote(Geocache cache);
 
     /**
-     * Reseting of modified coordinates on website to details
+     * enable/disable uploading modified coordinates to website
+     *
+     * @return true, when uploading is possible
+     */
+    public boolean supportsOwnCoordinates();
+
+    /**
+     * Resetting of modified coordinates on website to details
      *
      * @param cache
      * @return success
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 9e516e9..33bb1ce 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -79,6 +79,11 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
     }
 
     @Override
+    public boolean supportsPersonalNote() {
+        return true;
+    }
+
+    @Override
     public boolean supportsOwnCoordinates() {
         return true;
     }