From 7d6919d3f959de81725f1896743e8478742caf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rom=C3=A1n=20Mart=C3=ADnez?= Date: Sun, 14 Mar 2021 17:46:40 +0100 Subject: [PATCH] Bug fixed: ImportService send a list of Track.Id. --- .../dennisguse/opentracks/io/file/importer/ImportService.java | 2 +- .../io/file/importer/ImportServiceResultReceiver.java | 2 +- .../opentracks/io/file/importer/ImportViewModel.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java index d316bdfea..8bac87638 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java @@ -84,7 +84,7 @@ public class ImportService extends JobIntentService { private void sendResult(int resultCode, ArrayList trackId, DocumentFile file, String message) { Bundle bundle = new Bundle(); - bundle.putParcelableArrayList(ImportServiceResultReceiver.RESULT_EXTRA_TRACK_ID, trackId); + bundle.putParcelableArrayList(ImportServiceResultReceiver.RESULT_EXTRA_LIST_TRACK_ID, trackId); bundle.putString(ImportServiceResultReceiver.RESULT_EXTRA_FILENAME, file.getName()); bundle.putString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE, message); resultReceiver.send(resultCode, bundle); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportServiceResultReceiver.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportServiceResultReceiver.java index ee3d54314..e31631417 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportServiceResultReceiver.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportServiceResultReceiver.java @@ -16,7 +16,7 @@ public class ImportServiceResultReceiver extends ResultReceiver { public static final int RESULT_CODE_IMPORTED = 1; public static final int RESULT_CODE_ALREADY_EXISTS = 2; - public static final String RESULT_EXTRA_TRACK_ID = "result_track_id"; + public static final String RESULT_EXTRA_LIST_TRACK_ID = "result_track_id"; public static final String RESULT_EXTRA_FILENAME = "result_extra_filename"; public static final String RESULT_EXTRA_MESSAGE = "result_extra_message"; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java index 27cfe34fe..0b637b37e 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java @@ -68,7 +68,7 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe throw new RuntimeException(TAG + ": onReceiveResult resultData NULL"); } - Track.Id trackId = resultData.getParcelable(ImportServiceResultReceiver.RESULT_EXTRA_TRACK_ID); + ArrayList trackIds = resultData.getParcelableArrayList(ImportServiceResultReceiver.RESULT_EXTRA_LIST_TRACK_ID); String fileName = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_FILENAME); String message = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE); @@ -78,7 +78,7 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe summary.fileErrors.add(getApplication().getString(R.string.import_error_info, fileName, message)); break; case ImportServiceResultReceiver.RESULT_CODE_IMPORTED: - summary.importedTrackIds.add(trackId); + summary.importedTrackIds.addAll(trackIds); summary.successCount++; break; case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS: