Refactor post-workout export.

src/main/java/de/dennisguse/opentracks/io/file/ExportFile.java

@@ -1,21 +0,0 @@
-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/InitiateExportActivity.java

@@ -1,37 +0,0 @@
-package de.dennisguse.opentracks.io.file;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import de.dennisguse.opentracks.io.file.exporter.ExportActivity;
-import de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity;
-import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-
-public class InitiateExportActivity extends AppCompatActivity {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Uri directoryUri = PreferencesUtils.getDefaultExportDirectoryUri(this);
-        if (directoryUri != null) {
-            startActivity(createExportAllIntent(directoryUri));
-            finish();
-            return;
-        }
-
-        Intent intent = IntentUtils.newIntent(this, DirectoryChooserActivity.ExportDirectoryChooserActivity.class);
-        startActivity(intent);
-        finish();
-    }
-
-
-    protected Intent createExportAllIntent(Uri directoryUri) {
-        Intent intent = IntentUtils.newIntent(this, ExportActivity.class);
-        intent.putExtra(ExportActivity.EXTRA_DIRECTORY_URI_KEY, directoryUri);
-        intent.putExtra(ExportActivity.EXTRA_TRACKFILEFORMAT_KEY, PreferencesUtils.getExportTrackFileFormat(this));
-        return intent;
-    }
-}

src/main/java/de/dennisguse/opentracks/io/file/exporter/InstantPostWorkoutExport.java

@@ -1,40 +0,0 @@
-package de.dennisguse.opentracks.io.file.exporter;
-
-import android.content.Context;
-import android.net.Uri;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.documentfile.provider.DocumentFile;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.io.file.ExportFile;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-
-public class InstantPostWorkoutExport {
-
-    private static final String TAG = InstantPostWorkoutExport.class.getSimpleName();
-
-    public static void exportTrackToUri(Uri directoryUri, Context context, ContentProviderUtils contentProviderUtils, TrackFileFormat trackFileFormat, Track.Id trackId) {
-        DocumentFile directory = DocumentFile.fromTreeUri(context, directoryUri);
-
-        Track track = contentProviderUtils.getTrack(trackId);
-        DocumentFile file = ExportFile.getExportDocumentFile(trackId, trackFileFormat.getExtension(), directory, trackFileFormat.getExtension());
-
-        try (OutputStream outputStream = context.getContentResolver().openOutputStream(file.getUri())) {
-            TrackExportThread trackExportThread = new TrackExportThread(outputStream, context, trackFileFormat, track);
-            trackExportThread.run();
-            Toast.makeText(context, R.string.toast_message_instant_track_was_exported, Toast.LENGTH_SHORT).show();
-        }   catch (FileNotFoundException e) {
-            Log.e(TAG, "Unable to open file " + file.getName(), e);
-        } catch (IOException e) {
-            Log.e(TAG, "Unable to close file output stream", e);
-        }
-    }
-}

src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExportThread.java

@@ -1,31 +0,0 @@
-package de.dennisguse.opentracks.io.file.exporter;
-
-import android.content.Context;
-
-import java.io.OutputStream;
-
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
-
-public class TrackExportThread extends Thread {
-
-    private OutputStream outputStream;
-    private Context context;
-    private TrackFileFormat trackFileFormat;
-    private Track track;
-
-    public TrackExportThread(OutputStream outputStream, Context context, TrackFileFormat trackFileFormat, Track track) {
-        this.outputStream = outputStream;
-        this.context = context;
-        this.trackFileFormat = trackFileFormat;
-        this.track = track;
-    }
-
-    @Override
-    public void run() {
-        TrackExporter trackExporter = trackFileFormat.newTrackExporter(context);
-        trackExporter.writeTrack(track, outputStream);
-    }
-}

src/main/java/de/dennisguse/opentracks/io/file/importer/DefaultTrackExportDirectoryChooserActivity.java

@@ -1,45 +0,0 @@
-package de.dennisguse.opentracks.io.file.importer;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-
-import static de.dennisguse.opentracks.util.IntentUtils.persistDirectoryAccessPermission;
-
-public class DefaultTrackExportDirectoryChooserActivity extends AppCompatActivity {
-
-    private static final int DIRECTORY_PICKER_REQUEST_CODE = 6;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-
-        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
-        super.onActivityResult(requestCode, resultCode, resultData);
-        if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                Uri directoryUri = resultData.getData();
-
-                PreferencesUtils.setDefaultExportDirectoryUri(this, directoryUri);
-                persistDirectoryAccessPermission(getApplicationContext(), resultData, directoryUri);
-
-            }
-            finish();
-        }
-    }
-
-}

src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java

@@ -4,9 +4,11 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.DocumentsContract;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.documentfile.provider.DocumentFile;
 
 import de.dennisguse.opentracks.io.file.exporter.ExportActivity;
 import de.dennisguse.opentracks.util.IntentUtils;
@@ -21,31 +23,42 @@ public abstract class DirectoryChooserActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        configureDirectoryChooserIntent(intent);
-
-        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
+        DocumentFile directoryUri = configureDirectoryChooserIntent(intent);
+        if (directoryUri == null) {
+            startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
+        } else {
+            startActivity(createNextActivityIntent(directoryUri.getUri())); //TODO Refactor to DocumentFile
+            finish();
+        }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
         super.onActivityResult(requestCode, resultCode, resultData);
+        onActivityResultCustom(requestCode, resultCode, resultData);
+    }
+
+    protected void onActivityResultCustom(int requestCode, int resultCode, @Nullable Intent resultData) {
         if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
                 Uri directoryUri = resultData.getData();
 
                 startActivity(createNextActivityIntent(directoryUri));
             }
-            finish();
         }
+        finish();
     }
 
-    protected void configureDirectoryChooserIntent(Intent intent) {
+    /**
+     * @return null if directory needs to be selected.
+     */
+    protected DocumentFile configureDirectoryChooserIntent(Intent intent) {
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        return null;
     }
 
     protected abstract Intent createNextActivityIntent(Uri directoryUri);
 
-
     public static class ImportDirectoryChooserActivity extends DirectoryChooserActivity {
 
         @Override
@@ -58,6 +71,14 @@ public abstract class DirectoryChooserActivity extends AppCompatActivity {
 
     public static class ExportDirectoryChooserActivity extends DirectoryChooserActivity {
 
+        @Override
+        protected DocumentFile configureDirectoryChooserIntent(Intent intent) {
+            super.configureDirectoryChooserIntent(intent);
+            intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+
+            return PreferencesUtils.getDefaultExportDirectoryUri(this);
+        }
+
         @Override
         protected Intent createNextActivityIntent(Uri directoryUri) {
             Intent intent = IntentUtils.newIntent(this, ExportActivity.class);
@@ -65,11 +86,44 @@ public abstract class DirectoryChooserActivity extends AppCompatActivity {
             intent.putExtra(ExportActivity.EXTRA_TRACKFILEFORMAT_KEY, PreferencesUtils.getExportTrackFileFormat(this));
             return intent;
         }
+    }
+
+    public static class DefaultTrackExportDirectoryChooserActivity extends DirectoryChooserActivity {
 
         @Override
-        protected void configureDirectoryChooserIntent(Intent intent) {
+        protected void onActivityResultCustom(int requestCode, int resultCode, @Nullable Intent resultData) {
+            if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
+                switch (resultCode) {
+                    case RESULT_OK:
+                        Uri directoryUri = resultData.getData();
+
+                        PreferencesUtils.setDefaultExportDirectoryUri(this, directoryUri);
+                        IntentUtils.persistDirectoryAccessPermission(getApplicationContext(), resultData, directoryUri);
+                        break;
+                    case RESULT_CANCELED:
+                        PreferencesUtils.setDefaultExportDirectoryUri(this, null);
+                        //TODO Remove stored permission contentResolver.releasePersistableUriPermission
+                        break;
+                }
+
+            }
+            finish();
+        }
+
+        @Override
+        protected DocumentFile configureDirectoryChooserIntent(Intent intent) {
             super.configureDirectoryChooserIntent(intent);
             intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+            if (PreferencesUtils.isDefaultExportDirectoryUri(this)) {
+                intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, PreferencesUtils.getDefaultExportDirectoryUri(this).getUri());
+            }
+            return null;
+        }
+
+        @Override
+        protected Intent createNextActivityIntent(Uri directoryUri) {
+            finish();
+            return null;
         }
     }
 }