karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bug fixed: ImportService send a list of Track.Id.

Browse Source
This commit is contained in:
Román Martínez
2021-03-14 17:46:40 +01:00
committed by Dennis Guse
parent 7eceb979c3
commit 7d6919d3f9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class ImportService extends JobIntentService {
private void sendResult(int resultCode, ArrayList<Track.Id> trackId, DocumentFile file, String message) { private void sendResult(int resultCode, ArrayList<Track.Id> trackId, DocumentFile file, String message) {
Bundle bundle = new Bundle(); 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_FILENAME, file.getName());
bundle.putString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE, message); bundle.putString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE, message);
resultReceiver.send(resultCode, bundle); resultReceiver.send(resultCode, bundle);
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportServiceResultReceiver.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class ImportServiceResultReceiver extends ResultReceiver {
public static final int RESULT_CODE_IMPORTED = 1; public static final int RESULT_CODE_IMPORTED = 1;
public static final int RESULT_CODE_ALREADY_EXISTS = 2; 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_FILENAME = "result_extra_filename";
public static final String RESULT_EXTRA_MESSAGE = "result_extra_message"; public static final String RESULT_EXTRA_MESSAGE = "result_extra_message";
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
throw new RuntimeException(TAG + ": onReceiveResult resultData NULL"); throw new RuntimeException(TAG + ": onReceiveResult resultData NULL");
} }
Track.Id trackId = resultData.getParcelable(ImportServiceResultReceiver.RESULT_EXTRA_TRACK_ID); ArrayList<Track.Id> trackIds = resultData.getParcelableArrayList(ImportServiceResultReceiver.RESULT_EXTRA_LIST_TRACK_ID);
String fileName = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_FILENAME); String fileName = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_FILENAME);
String message = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE); 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)); summary.fileErrors.add(getApplication().getString(R.string.import_error_info, fileName, message));
break; break;
case ImportServiceResultReceiver.RESULT_CODE_IMPORTED: case ImportServiceResultReceiver.RESULT_CODE_IMPORTED:
summary.importedTrackIds.add(trackId); summary.importedTrackIds.addAll(trackIds);
summary.successCount++; summary.successCount++;
break; break;
case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS: case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS: