Bugfix: avoid crash in exporter.

This commit is contained in:
Dennis Guse
2026-09-03 17:50:03 +02:00
parent 10273cd772
commit 4dfd2485bf
@@ -105,7 +105,7 @@ public class ExportActivity extends AbstractActivity {
private ContentProviderUtils contentProviderUtils; private ContentProviderUtils contentProviderUtils;
// List of tracks to be exported. // 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 LinkedBlockingQueue<PendingConflict> conflictsQueue = new LinkedBlockingQueue<>();
private final Handler conflictsHandler = new Handler(); private final Handler conflictsHandler = new Handler();
@@ -183,7 +183,7 @@ public class ExportActivity extends AbstractActivity {
trackExportTotalCount = savedInstanceState.getInt(BUNDLE_TOTAL_COUNT); trackExportTotalCount = savedInstanceState.getInt(BUNDLE_TOTAL_COUNT);
directoryFiles = savedInstanceState.getStringArrayList(BUNDLE_DIRECTORY_FILES); directoryFiles = savedInstanceState.getStringArrayList(BUNDLE_DIRECTORY_FILES);
trackErrors = savedInstanceState.getStringArrayList(BUNDLE_TRACK_ERRORS); trackErrors = savedInstanceState.getStringArrayList(BUNDLE_TRACK_ERRORS);
exportTasks = new ArrayList<>(savedInstanceState.getParcelableArrayList(BUNDLE_EXPORT_TASKS)); exportTasks.addAll(savedInstanceState.getParcelableArrayList(BUNDLE_EXPORT_TASKS));
setProgress(); setProgress();
nextExport(null); nextExport(null);
} }
@@ -226,7 +226,6 @@ public class ExportActivity extends AbstractActivity {
return false; return false;
} }
exportTasks = new ArrayList<>();
if (allInOneFile) { if (allInOneFile) {
String filename = "OpenTracks-Backup"; String filename = "OpenTracks-Backup";
exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::id).toList())); exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::id).toList()));