From 074484393e3671c22f8ae01790dddac33671e61b Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 15 Mar 2025 20:36:00 +0100
Subject: [PATCH] Bugfix: Markers without photo could not be deleted (created
 pre v4.18.0).

Introduced in 1b33184835cb15ba2b598116ce8589ed320dd42b

Fixes #2071.
---
 .../dennisguse/opentracks/data/ContentProviderUtils.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
index 81fae11d5..061b0a2e3 100644
--- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
@@ -434,7 +434,14 @@ public class ContentProviderUtils {
             marker.setIcon(cursor.getString(iconIndex));
         }
         if (!cursor.isNull(photoUrlIndex)) {
-            marker.setPhotoUrl(Uri.parse(cursor.getString(photoUrlIndex)));
+            String photoUrl = cursor.getString(photoUrlIndex);
+            if (photoUrl.isEmpty()) {
+                // Before v4.18.0: a marker without a picture as URL ""
+                // TODO Data should be migrated.
+                marker.setPhotoUrl(null);
+            } else {
+                marker.setPhotoUrl(Uri.parse(cursor.getString(photoUrlIndex)));
+            }
         }