From f209031df09032ff7c37c690cf2ce4b48380fde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rom=C3=A1n?= Date: Mon, 13 Jul 2020 11:17:10 +0200 Subject: [PATCH] Pass extra TrackFileFormat enum like a Serializable instead of String (with String resulted in Null after get extra). --- .../fragments/ExportProgressDialogFragment.java | 8 ++++---- .../opentracks/io/file/exporter/ExportActivity.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java index cdab84e76..ddaf9bde5 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java @@ -50,7 +50,7 @@ public class ExportProgressDialogFragment extends DialogFragment { private static final String TAG = ExportProgressDialogFragment.class.getSimpleName(); - public static final String EXPORT_DIALOG_TAG = "import_dialog_tag"; + public static final String EXPORT_DIALOG_TAG = "export_dialog_tag"; private DismissCallback caller; @@ -64,10 +64,10 @@ public class ExportProgressDialogFragment extends DialogFragment { /** * Create a new instance. */ - public static void showDialog(FragmentManager fragmentManager, String trackFileFormat, Uri documentFileUri) { + public static void showDialog(FragmentManager fragmentManager, TrackFileFormat trackFileFormat, Uri documentFileUri) { Bundle bundle = new Bundle(); bundle.putParcelable(EXTRA_DIRECTORY_URI_KEY, documentFileUri); - bundle.putString(EXTRA_DIRECTORY_URI_KEY, trackFileFormat); + bundle.putSerializable(EXTRA_TRACKFILEFORMAT_KEY, trackFileFormat); ExportProgressDialogFragment dialogFragment = new ExportProgressDialogFragment(); dialogFragment.setArguments(bundle); @@ -83,7 +83,7 @@ public class ExportProgressDialogFragment extends DialogFragment { setRetainInstance(true); Uri directoryUri = getArguments().getParcelable(EXTRA_DIRECTORY_URI_KEY); - TrackFileFormat trackFileFormat = TrackFileFormat.valueOf(getArguments().getString(EXTRA_TRACKFILEFORMAT_KEY)); + TrackFileFormat trackFileFormat = (TrackFileFormat) getArguments().getSerializable(EXTRA_TRACKFILEFORMAT_KEY); DocumentFile documentFile = DocumentFile.fromTreeUri(getContext(), directoryUri); directoryDisplayName = FileUtils.getPath(documentFile); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java index 61a84e9ea..67386e03f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java @@ -24,6 +24,7 @@ import androidx.fragment.app.FragmentActivity; import de.dennisguse.opentracks.fragments.ExportFinishedDialogFragment; import de.dennisguse.opentracks.fragments.ExportProgressDialogFragment; +import de.dennisguse.opentracks.io.file.TrackFileFormat; /** * An activity for saving tracks to the external storage. @@ -44,7 +45,7 @@ public class ExportActivity extends FragmentActivity implements ExportProgressDi if (savedInstanceState == null || !savedInstanceState.getBoolean(BUNDLE_ACTIVITY_RECREATED, false)) { Uri directoryUri = getIntent().getParcelableExtra(EXTRA_DIRECTORY_URI_KEY); - String trackfileformat = getIntent().getStringExtra(EXTRA_TRACKFILEFORMAT_KEY); + TrackFileFormat trackfileformat = (TrackFileFormat) getIntent().getSerializableExtra(EXTRA_TRACKFILEFORMAT_KEY); ExportProgressDialogFragment.showDialog(getSupportFragmentManager(), trackfileformat, directoryUri); } }