Refactor getGpxFileName (sanitize file name)

osmandapp · Dec 2, 2024 · ffca910 · ffca910
1 parent a2cb935
commit ffca910
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelArticle.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelArticle.java
@@ -127,8 +127,20 @@ public String getRouteId() {
 		return routeId;
 	}
 
+	@NonNull
 	public String getGpxFileName() {
-		return !Algorithms.isEmpty(title) ? title : routeId;
+		String gpxFileName = !Algorithms.isEmpty(title) ? title : routeId;
+		if (gpxFileName != null) {
+			return gpxFileName
+				.replace('/', '_')
+				.replace('\'', '_')
+				.replace('\"', '_')
+				.replace('\r', '_')
+				.replace('\n', '_');
+		} else {
+			LOG.error("Empty travel article in " + this.file);
+			return "Travel Article File"; // @NonNull
+		}
 	}
 
 	public String getRouteSource() {

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
@@ -733,13 +733,7 @@ public void openTrackMenu(@NonNull TravelArticle article, @NonNull MapActivity m
 	@NonNull
 	@Override
 	public String getGPXName(@NonNull TravelArticle article) {
-		return article.getGpxFileName()
-				.replace('/', '_')
-				.replace('\'', '_')
-				.replace('\"', '_')
-				.replace('\r', '_')
-				.replace('\n', '_')
-				+ GPX_FILE_EXT;
+		return article.getGpxFileName() + GPX_FILE_EXT;
 	}
 
 	@NonNull

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
@@ -1069,13 +1069,7 @@ public ArrayList<String> getArticleLangs(@NonNull TravelArticleIdentifier articl
 	@NonNull
 	@Override
 	public String getGPXName(@NonNull TravelArticle article) {
-		return article.getGpxFileName()
-				.replace('/', '_')
-				.replace('\'', '_')
-				.replace('\"', '_')
-				.replace('\r', '_')
-				.replace('\n', '_')
-				+ GPX_FILE_EXT;
+		return article.getGpxFileName() + GPX_FILE_EXT;
 	}
 
 	@NonNull