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

extract logic for creating DocumentFile for export to align naming

Browse Source
This commit is contained in:
thrillfall
2020-09-11 13:48:36 +02:00
committed by Dennis Guse
parent 88cf46d999
commit 5a44da3fb0
3 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java
+13 -13
View File
@@ -38,7 +38,7 @@ import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.Track;
import de.dennisguse.opentracks.content.data.TracksColumns;
import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
import de.dennisguse.opentracks.io.file.ExportFileName;
import de.dennisguse.opentracks.io.file.ExportFile;
import de.dennisguse.opentracks.io.file.TrackFileFormat;
import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
import de.dennisguse.opentracks.util.DialogUtils;
@@ -209,32 +209,32 @@ public class ExportProgressDialogFragment extends DialogFragment {
private Boolean exportTrack(Context context, Track track) {
TrackExporter trackExporter = trackFileFormat.newTrackExporter(context);
String fileName = ExportFileName.getExportFileNameByTrackId(track.getId(), trackFileFormat.getExtension());
DocumentFile exportDocumentFile = ExportFile.getExportDocumentFile(
track.getId(),
trackFileFormat.getExtension(),
directory,
trackFileFormat.getMimeType()
);
// Overwrite a file if it exists; DocumentFile.createFile() creates a new file appending a suffix if the displayname already exists.
DocumentFile file = directory.findFile(fileName);
if (file == null) {
file = directory.createFile(trackFileFormat.getMimeType(), fileName);
}
try (OutputStream outputStream = context.getContentResolver().openOutputStream(file.getUri())) {
try (OutputStream outputStream = context.getContentResolver().openOutputStream(exportDocumentFile.getUri())) {
if (trackExporter.writeTrack(track, outputStream)) {
return true;
} else {
if (!file.delete()) {
Log.e(TAG, "Unable to delete file");
if (!exportDocumentFile.delete()) {
Log.e(TAG, "Unable to delete exportDocumentFile");
}
Log.e(TAG, "Unable to export track");
return false;
}
} catch (FileNotFoundException e) {
Log.e(TAG, "Unable to open file " + file.getName(), e);
Log.e(TAG, "Unable to open exportDocumentFile " + exportDocumentFile.getName(), e);
return false;
} catch (IOException e) {
Log.e(TAG, "Unable to close file output stream", e);
Log.e(TAG, "Unable to close exportDocumentFile output stream", e);
return false;
}
}
}
public interface DismissCallback {
src/main/java/de/dennisguse/opentracks/io/file/ExportFile.java
+21
View File
@@ -0,0 +1,21 @@
package de.dennisguse.opentracks.io.file;
import androidx.documentfile.provider.DocumentFile;
import de.dennisguse.opentracks.content.data.Track;
public class ExportFile {
public static DocumentFile getExportDocumentFile(Track.Id trackId, String trackFileFormatExtension, DocumentFile directory, String mimeType) {
String fileName = getExportFileNameByTrackId(trackId, trackFileFormatExtension);
DocumentFile file = directory.findFile(fileName);
if (file == null) {
file = directory.createFile(mimeType, fileName);
}
return file;
}
private static String getExportFileNameByTrackId(Track.Id trackId, String trackFileFormatExtension) {
return trackId.getId() + "." + trackFileFormatExtension;
}
}
src/main/java/de/dennisguse/opentracks/io/file/ExportFileName.java
-10
View File
@@ -1,10 +0,0 @@
package de.dennisguse.opentracks.io.file;
import de.dennisguse.opentracks.content.data.Track;
public class ExportFileName {
public static String getExportFileNameByTrackId(Track.Id trackId, String trackFileFormatExtension) {
return trackId.getId() + "." + trackFileFormatExtension;
}
}