Merge branch 'develop' into issue-64

Andyporras · web-flow · commit 2ffbb29c11ec · 2025-02-10T16:39:39.000-06:00
diff --git a/app/src/main/java/net/osmtracker/gpx/ExportToTempFileTask.java b/app/src/main/java/net/osmtracker/gpx/ExportToTempFileTask.java
@@ -29,6 +29,7 @@ public ExportToTempFileTask(Context context, long trackId) {
 		String desiredOutputFormat = PreferenceManager.getDefaultSharedPreferences(context).getString(
 				OSMTracker.Preferences.KEY_OUTPUT_FILENAME,
 				OSMTracker.Preferences.VAL_OUTPUT_FILENAME);
+
 		try {
 			String trackName = new DataHelper(context).getTrackById(trackId).getName();
 
diff --git a/app/src/main/java/net/osmtracker/gpx/ZipHelper.java b/app/src/main/java/net/osmtracker/gpx/ZipHelper.java
@@ -42,6 +42,7 @@ public static File zipCacheFiles(Context context, long trackId, File fileGPX) {
             if(!traceFilesDirectory.exists()){
                 return zipFile;
             }
+          
             for (File multimediaFile : Objects.requireNonNull(traceFilesDirectory.listFiles())) {
                 if (!multimediaFile.isDirectory()) { // Avoid adding empty folders
                     // only add files that are not .zip files
@@ -63,6 +64,7 @@ public static File zipCacheFiles(Context context, long trackId, File fileGPX) {
             return null;
         }
     }
+
     /***
      * Compresses file gpx into a zip file.
      * @param context   Application context.
@@ -83,6 +85,7 @@ public static File zipFile(Context context, long trackId, File fileGPX) {
         }
     }
 
+
     /**
      * Adds a file to the ZIP archive.
      *

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public static File zipCacheFiles(Context context, long trackId, File fileGPX) {`
`42`	`42`	`if(!traceFilesDirectory.exists()){`
`43`	`43`	`return zipFile;`
`44`	`44`	`}`
	`45`	`+`
`45`	`46`	`for (File multimediaFile : Objects.requireNonNull(traceFilesDirectory.listFiles())) {`
`46`	`47`	`if (!multimediaFile.isDirectory()) { // Avoid adding empty folders`
`47`	`48`	`// only add files that are not .zip files`
`@@ -63,6 +64,7 @@ public static File zipCacheFiles(Context context, long trackId, File fileGPX) {`
`63`	`64`	`return null;`
`64`	`65`	`}`
`65`	`66`	`}`
	`67`	`+`
`66`	`68`	`/***`
`67`	`69`	`* Compresses file gpx into a zip file.`
`68`	`70`	`* @param context Application context.`
`@@ -83,6 +85,7 @@ public static File zipFile(Context context, long trackId, File fileGPX) {`
`83`	`85`	`}`
`84`	`86`	`}`
`85`	`87`
	`88`	`+`
`86`	`89`	`/**`
`87`	`90`	`* Adds a file to the ZIP archive.`
`88`	`91`	`*`