Fixes #3797, Waypoints from personal note not removed

- make 'personal note' waypoints 'own' (allowing deletion by user)
- never delete them automatically
- changed place of note parsing to allow correct duplicate detection

1 files changed, 2 insertions, 9 deletions

diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java
index 5cfeb29..b4979e4 100644
--- a/main/src/cgeo/geocaching/Waypoint.java
+++ b/main/src/cgeo/geocaching/Waypoint.java
@@ -97,18 +97,11 @@ public class Waypoint implements IWaypoint {
             if (newPrefixes.containsKey(prefix)) {
                 newPrefixes.get(prefix).merge(oldWaypoint);
             } else if (oldWaypoint.isUserDefined() || forceMerge) {
-                // personal note waypoints should always be taken from the new list only
-                if (!isPersonalNoteWaypoint(oldWaypoint)) {
-                    newPoints.add(oldWaypoint);
-                }
+                newPoints.add(oldWaypoint);
             }
         }
     }
 
-    private static boolean isPersonalNoteWaypoint(final @NonNull Waypoint waypoint) {
-        return StringUtils.startsWith(waypoint.getName(), CgeoApplication.getInstance().getString(R.string.cache_personal_note) + " ");
-    }
-
     public boolean isUserDefined() {
         return own || WaypointType.OWN == waypointType;
     }
@@ -304,7 +297,7 @@ public class Waypoint implements IWaypoint {
                         ((point.getLatitudeE6() % 1000) != 0 || (point.getLongitudeE6() % 1000) != 0)) {
                     final String name = CgeoApplication.getInstance().getString(R.string.cache_personal_note) + " " + count;
                     final String potentialWaypointType = note.substring(Math.max(0, matcher.start() - 15));
-                    final Waypoint waypoint = new Waypoint(name, parseWaypointType(potentialWaypointType), false);
+                    final Waypoint waypoint = new Waypoint(name, parseWaypointType(potentialWaypointType), true);
                     waypoint.setCoords(point);
                     waypoints.add(waypoint);
                     count++;