From 4dfd2485bff01b586f97918db67dc11f11e17ca1 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 3 Sep 2026 17:50:03 +0200
Subject: [PATCH] Bugfix: avoid crash in exporter.

---
 .../opentracks/io/file/exporter/ExportActivity.java          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
index 5b4343fe8..37c4f3e0c 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
@@ -105,7 +105,7 @@ public class ExportActivity extends AbstractActivity {
     private ContentProviderUtils contentProviderUtils;
 
     // List of tracks to be exported.
-    private ArrayList<ExportTask> exportTasks;
+    private final ArrayList<ExportTask> exportTasks = new ArrayList<>();
 
     private final LinkedBlockingQueue<PendingConflict> conflictsQueue = new LinkedBlockingQueue<>();
     private final Handler conflictsHandler = new Handler();
@@ -183,7 +183,7 @@ public class ExportActivity extends AbstractActivity {
             trackExportTotalCount = savedInstanceState.getInt(BUNDLE_TOTAL_COUNT);
             directoryFiles = savedInstanceState.getStringArrayList(BUNDLE_DIRECTORY_FILES);
             trackErrors = savedInstanceState.getStringArrayList(BUNDLE_TRACK_ERRORS);
-            exportTasks = new ArrayList<>(savedInstanceState.getParcelableArrayList(BUNDLE_EXPORT_TASKS));
+            exportTasks.addAll(savedInstanceState.getParcelableArrayList(BUNDLE_EXPORT_TASKS));
             setProgress();
             nextExport(null);
         }
@@ -226,7 +226,6 @@ public class ExportActivity extends AbstractActivity {
             return false;
         }
 
-        exportTasks = new ArrayList<>();
         if (allInOneFile) {
             String filename = "OpenTracks-Backup";
             exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::id).toList()));