From 0a046fc100801408b44acfa1d48dfda7aeb56c15 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Mon, 2 Sep 2019 18:02:43 +0200 Subject: [PATCH] Cleanup. --- .../io/file/exporter/ExportActivity.java | 16 ++++++++-------- .../{SaveAsyncTask.java => ExportAsyncTask.java} | 6 +++--- .../io/file/importer/ImportActivity.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/de/dennisguse/opentracks/io/file/exporter/{SaveAsyncTask.java => ExportAsyncTask.java} (96%) 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 de398a1aa..17872ffd9 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 @@ -46,7 +46,7 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr private String directoryDisplayName; - private SaveAsyncTask saveAsyncTask; + private ExportAsyncTask exportAsyncTask; private ProgressDialog progressDialog; // the number of tracks successfully saved @@ -81,14 +81,14 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr directoryDisplayName = FileUtils.getPathDisplayName(trackFileFormat.getExtension()); - //TODO (still needed?): getLastNonConfiguration instance returned SaveAsyncTask before + //TODO (still needed?): getLastNonConfiguration instance returned ExportAsyncTask before // Object retained = getLastNonConfigurationInstance(); -// if (retained instanceof SaveAsyncTask) { -// saveAsyncTask = (SaveAsyncTask) retained; -// saveAsyncTask.setActivity(this); +// if (retained instanceof ExportAsyncTask) { +// exportAsyncTask = (ExportAsyncTask) retained; +// exportAsyncTask.setActivity(this); // } else { - saveAsyncTask = new SaveAsyncTask(this, trackFileFormat, directory); - saveAsyncTask.execute(); + exportAsyncTask = new ExportAsyncTask(this, trackFileFormat, directory); + exportAsyncTask.execute(); // } } @@ -106,7 +106,7 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr new DialogInterface.OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { - saveAsyncTask.cancel(true); + exportAsyncTask.cancel(true); dialog.dismiss(); onDismissed(); } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveAsyncTask.java rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java index f07c389c8..efec1e9c0 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveAsyncTask.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java @@ -42,9 +42,9 @@ import de.dennisguse.opentracks.util.SystemUtils; * @author Jimmy Shih */ //TODO Make independent from ExportActivity? -public class SaveAsyncTask extends AsyncTask { +public class ExportAsyncTask extends AsyncTask { - private static final String TAG = SaveAsyncTask.class.getSimpleName(); + private static final String TAG = ExportAsyncTask.class.getSimpleName(); private final TrackFileFormat trackFileFormat; private final File directory; private final Context context; @@ -71,7 +71,7 @@ public class SaveAsyncTask extends AsyncTask { * @param trackFileFormat the track file format * @param directory the directory to write the file */ - public SaveAsyncTask(ExportActivity exportActivity, TrackFileFormat trackFileFormat, File directory) { + public ExportAsyncTask(ExportActivity exportActivity, TrackFileFormat trackFileFormat, File directory) { this.exportActivity = exportActivity; this.trackFileFormat = trackFileFormat; this.directory = directory; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java index 1eb06c0cd..0d198f2e1 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java @@ -84,7 +84,7 @@ public class ImportActivity extends FragmentActivity implements FileTypeDialogFr return; } - //TODO (still needed?): getLastNonConfiguration instance returned SaveAsyncTask before + //TODO (still needed?): getLastNonConfiguration instance returned ExportAsyncTask before // Object retained = getLastNonConfigurationInstance(); // if (retained instanceof ImportAsyncTask) { // importAsyncTask = (ImportAsyncTask) retained;