From d3109bbc37d10c85ed8b47508429342eae55d08f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 5 Feb 2020 19:30:08 +0100 Subject: [PATCH] Cleanup. --- .../provider/CustomContentProviderTest.java | 9 ++-- .../provider/CustomContentProvider.java | 36 +-------------- .../provider/CustomSQLiteOpenHelper.java | 44 +++++++++++++++++++ .../opentracks/io/file/TrackFileFormat.java | 4 +- .../io/file/exporter/ExportAsyncTask.java | 10 ++--- 5 files changed, 55 insertions(+), 48 deletions(-) create mode 100644 src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java index b17dc4638..9c82bbf66 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java @@ -30,7 +30,6 @@ import org.junit.Test; import de.dennisguse.opentracks.content.data.TrackPointsColumns; import de.dennisguse.opentracks.content.data.TracksColumns; import de.dennisguse.opentracks.content.data.WaypointsColumns; -import de.dennisguse.opentracks.content.provider.CustomContentProvider.DatabaseHelper; /** * Tests {@link CustomContentProvider}. @@ -48,13 +47,13 @@ public class CustomContentProviderTest { @Before public void setUp() { context.deleteDatabase(DATABASE_NAME); - db = (new DatabaseHelper(context, DATABASE_NAME)).getWritableDatabase(); + db = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getWritableDatabase(); customContentProvider = new CustomContentProvider() { }; } /** - * Tests {@link CustomContentProvider.DatabaseHelper#onCreate(SQLiteDatabase)}. + * Tests {@link CustomSQLiteOpenHelper#onCreate(SQLiteDatabase)}. */ @Test public void testDatabaseHelper_OnCreate() { @@ -148,7 +147,7 @@ public class CustomContentProviderTest { createTable(TrackPointsColumns.TABLE_NAME); createTable(WaypointsColumns.TABLE_NAME); - DatabaseHelper databaseHelper = new DatabaseHelper(context); - databaseHelper.onUpgrade(db, oldVersion, CustomContentProvider.DATABASE_VERSION); + CustomSQLiteOpenHelper databaseHelper = new CustomSQLiteOpenHelper(context); + databaseHelper.onUpgrade(db, oldVersion, CustomSQLiteOpenHelper.DATABASE_VERSION); } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java index 5e0fc8b3e..43f746ce6 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java @@ -25,7 +25,6 @@ import android.database.Cursor; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; -import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteQueryBuilder; import android.net.Uri; import android.text.TextUtils; @@ -45,12 +44,6 @@ import de.dennisguse.opentracks.content.data.WaypointsColumns; */ public abstract class CustomContentProvider extends ContentProvider { - @VisibleForTesting - static final int DATABASE_VERSION = 23; - - @VisibleForTesting - static final String DATABASE_NAME = "database.db"; - private static final String TAG = CustomContentProvider.class.getSimpleName(); private static final String SQL_LIST_DELIMITER = ","; @@ -85,7 +78,7 @@ public abstract class CustomContentProvider extends ContentProvider { */ @VisibleForTesting boolean onCreate(Context context) { - DatabaseHelper databaseHelper = new DatabaseHelper(context); + CustomSQLiteOpenHelper databaseHelper = new CustomSQLiteOpenHelper(context); try { db = databaseHelper.getWritableDatabase(); } catch (SQLiteException e) { @@ -391,31 +384,4 @@ public abstract class CustomContentProvider extends ContentProvider { WAYPOINTS, WAYPOINTS_BY_ID } - - /** - * Database helper for creating and upgrading the database. - */ - @VisibleForTesting - static class DatabaseHelper extends SQLiteOpenHelper { - - public DatabaseHelper(Context context) { - this(context, DATABASE_NAME); - } - - @VisibleForTesting - public DatabaseHelper(Context context, String databaseName) { - super(context, databaseName, null, DATABASE_VERSION); - } - - @Override - public void onCreate(SQLiteDatabase db) { - db.execSQL(TrackPointsColumns.CREATE_TABLE); - db.execSQL(TracksColumns.CREATE_TABLE); - db.execSQL(WaypointsColumns.CREATE_TABLE); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - } - } } diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java b/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java new file mode 100644 index 000000000..6e3c0f0c3 --- /dev/null +++ b/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java @@ -0,0 +1,44 @@ +package de.dennisguse.opentracks.content.provider; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; + +import androidx.annotation.VisibleForTesting; + +import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.WaypointsColumns; + +/** + * Database helper for creating and upgrading the database. + */ +@VisibleForTesting +public class CustomSQLiteOpenHelper extends SQLiteOpenHelper { + + @VisibleForTesting + static final int DATABASE_VERSION = 23; + + @VisibleForTesting + static final String DATABASE_NAME = "database.db"; + + public CustomSQLiteOpenHelper(Context context) { + this(context, DATABASE_NAME); + } + + @VisibleForTesting + public CustomSQLiteOpenHelper(Context context, String databaseName) { + super(context, databaseName, null, DATABASE_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + db.execSQL(TrackPointsColumns.CREATE_TABLE); + db.execSQL(TracksColumns.CREATE_TABLE); + db.execSQL(WaypointsColumns.CREATE_TABLE); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + } +} diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java index 83a2ddaab..c6aed8d60 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java @@ -232,7 +232,9 @@ public enum TrackFileFormat { /** * Returns whether the format supports photos. */ - public boolean includesPhotos() { return false; }; + public boolean includesPhotos() { + return false; + } /** * Returns the name of for each format. diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java index a5b984dc1..7c64f62fa 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java @@ -50,10 +50,10 @@ public class ExportAsyncTask extends AsyncTask { private ExportActivity exportActivity; private WakeLock wakeLock; - private boolean completed; + private boolean completed = false; - private int processedTrackCount; - private int totalTrackCount; + private int processedTrackCount = 0; + private int totalTrackCount = 0; /** * Creates an AsyncTask. @@ -68,10 +68,6 @@ public class ExportAsyncTask extends AsyncTask { this.directory = directory; context = exportActivity.getApplicationContext(); contentProviderUtils = new ContentProviderUtils(context); - - completed = false; - processedTrackCount = 0; - totalTrackCount = 0; } /**