Merge pull request #10168 from osmandapp/markers_backup

Markers backup fixes

OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java

@@ -55,7 +55,7 @@ public class GPXUtilities {
 	private static final String GAP_PROFILE_TYPE = "gap";
 	private static final String TRKPT_INDEX_EXTENSION = "trkpt_idx";
 
-	private final static String GPX_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; //$NON-NLS-1$
+	public final static String GPX_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; //$NON-NLS-1$
 	private final static String GPX_TIME_FORMAT_MILLIS = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; //$NON-NLS-1$
 
 	private final static NumberFormat latLonFormat = new DecimalFormat("0.00#####", new DecimalFormatSymbols(

OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java

@@ -35,17 +35,23 @@ import org.apache.commons.logging.Log;
 import java.io.File;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import static net.osmand.GPXUtilities.GPX_TIME_FORMAT;
 import static net.osmand.data.PointDescription.POINT_TYPE_MAP_MARKER;
 
 public class MapMarkersHelper {
@@ -1005,6 +1011,20 @@ public class MapMarkersHelper {
 		});
 	}
 
+	public List<MapMarker> getMapMarkersFromDefaultGroups(boolean history) {
+		List<MapMarker> mapMarkers = new ArrayList<>();
+		for (MapMarkersGroup group : mapMarkersGroups) {
+			if (group.getType() == MapMarkersGroup.ANY_TYPE) {
+				for (MapMarker marker : group.getMarkers()) {
+					if (history && marker.history || !history && !marker.history) {
+						mapMarkers.add(marker);
+					}
+				}
+			}
+		}
+		return mapMarkers;
+	}
+
 	public String saveMarkersToFile(String fileName) {
 		GPXFile gpxFile = generateGpx();
 		String dirName = IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR;
@@ -1024,6 +1044,9 @@ public class MapMarkersHelper {
 	}
 
 	public GPXFile generateGpx(List<MapMarker> markers, boolean completeBackup) {
+		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
+		format.setTimeZone(TimeZone.getTimeZone("UTC"));
+
 		GPXFile gpxFile = new GPXFile(Version.getFullVersion(ctx));
 		for (MapMarker marker : markers) {
 			WptPt wpt = new WptPt();
@@ -1033,10 +1056,10 @@ public class MapMarkersHelper {
 			wpt.setColor(ContextCompat.getColor(ctx, MapMarker.getColorId(marker.colorIndex)));
 			if (completeBackup) {
 				if (marker.creationDate != 0) {
-					wpt.getExtensionsToWrite().put(CREATION_DATE, String.valueOf(marker.creationDate));
+					wpt.getExtensionsToWrite().put(CREATION_DATE, format.format(new Date(marker.creationDate)));
 				}
 				if (marker.visitedDate != 0) {
-					wpt.getExtensionsToWrite().put(VISITED_DATE, String.valueOf(marker.visitedDate));
+					wpt.getExtensionsToWrite().put(VISITED_DATE, format.format(new Date(marker.visitedDate)));
 				}
 			}
 			gpxFile.addPoint(wpt);
@@ -1045,6 +1068,9 @@ public class MapMarkersHelper {
 	}
 
 	public List<MapMarker> readMarkersFromGpx(GPXFile gpxFile, boolean history) {
+		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
+		format.setTimeZone(TimeZone.getTimeZone("UTC"));
+
 		List<MapMarker> mapMarkers = new ArrayList<>();
 		for (WptPt point : gpxFile.getPoints()) {
 			LatLon latLon = new LatLon(point.lat, point.lon);
@@ -1055,8 +1081,8 @@ public class MapMarkersHelper {
 
 			String visitedDateStr = point.getExtensionsToRead().get(VISITED_DATE);
 			String creationDateStr = point.getExtensionsToRead().get(CREATION_DATE);
-			marker.visitedDate = Algorithms.parseLongSilently(visitedDateStr, 0);
+			marker.visitedDate = parseTime(visitedDateStr, format);
-			marker.creationDate = Algorithms.parseLongSilently(creationDateStr, 0);
+			marker.creationDate = parseTime(creationDateStr, format);
 			marker.nextKey = history ? MapMarkersDbHelper.HISTORY_NEXT_VALUE : MapMarkersDbHelper.TAIL_NEXT_VALUE;
 
 			mapMarkers.add(marker);
@@ -1064,6 +1090,18 @@ public class MapMarkersHelper {
 		return mapMarkers;
 	}
 
+	private static long parseTime(String text, SimpleDateFormat format) {
+		long time = 0;
+		if (text != null) {
+			try {
+				time = format.parse(text).getTime();
+			} catch (ParseException e) {
+				LOG.error(e);
+			}
+		}
+		return time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	// accessors to active markers:

OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java

@@ -46,7 +46,7 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
 	protected void init() {
 		super.init();
 		markersHelper = app.getMapMarkersHelper();
-		existingItems = new ArrayList<>(markersHelper.getMapMarkersHistory());
+		existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(true));
 	}
 
 	@NonNull

OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java

@@ -46,7 +46,7 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
 	protected void init() {
 		super.init();
 		markersHelper = app.getMapMarkersHelper();
-		existingItems = new ArrayList<>(markersHelper.getMapMarkers());
+		existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(false));
 	}
 
 	@NonNull

OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java

@@ -597,7 +597,7 @@ public class SettingsHelper {
 		if (!files.isEmpty()) {
 			dataList.put(ExportSettingsType.VOICE, files);
 		}
-		List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkers();
+		List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(false);
 		if (!mapMarkers.isEmpty()) {
 			String name = app.getString(R.string.map_markers);
 			String groupId = ExportSettingsType.ACTIVE_MARKERS.name();
@@ -605,7 +605,7 @@ public class SettingsHelper {
 			markersGroup.setMarkers(mapMarkers);
 			dataList.put(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup));
 		}
-		List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersHistory();
+		List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(true);
 		if (!markersHistory.isEmpty()) {
 			String name = app.getString(R.string.shared_string_history);
 			String groupId = ExportSettingsType.HISTORY_MARKERS.name();