Implement async database calls

app/src/main/java/org/traccar/client/DatabaseHelper.java

@@ -21,6 +21,7 @@ import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.os.AsyncTask;
 
 import java.util.Date;
 
@@ -29,8 +30,47 @@ public class DatabaseHelper extends SQLiteOpenHelper {
     public static final int DATABASE_VERSION = 1;
     public static final String DATABASE_NAME = "traccar.db";
 
+    public interface DatabaseHandler<T> {
+        void onSuccess(T result);
+        void onFailure(RuntimeException error);
+    }
+
+    private static abstract class DatabaseAsyncTask<T> extends AsyncTask<Void, Void, T> {
+
+        private DatabaseHandler<T> handler;
+        private RuntimeException error;
+
+        public DatabaseAsyncTask(DatabaseHandler<T> handler) {
+            this.handler = handler;
+        }
+
+        @Override
+        protected T doInBackground(Void... params) {
+            try {
+                return executeMethod();
+            } catch (RuntimeException error) {
+                this.error = error;
+                return null;
+            }
+        }
+
+        protected abstract T executeMethod();
+
+        @Override
+        protected void onPostExecute(T result) {
+            if (error == null) {
+                handler.onSuccess(result);
+            } else {
+                handler.onFailure(error);
+            }
+        }
+    }
+
+    private SQLiteDatabase db;
+
     public DatabaseHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        db = getWritableDatabase();
     }
 
     @Override
@@ -53,7 +93,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         onCreate(db);
     }
 
-    public void insertPosition(SQLiteDatabase db, Position position) {
+    public void insertPosition(Position position) {
         ContentValues values = new ContentValues();
         values.put("deviceId", position.getDeviceId());
         values.put("time", position.getTime().getTime());
@@ -67,7 +107,17 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         db.insertOrThrow("position", null, values);
     }
 
-    public Position selectPosition(SQLiteDatabase db) {
+    public void insertPositionAsync(final Position position, DatabaseHandler<Void> handler) {
+        new DatabaseAsyncTask<Void>(handler) {
+            @Override
+            protected Void executeMethod() {
+                insertPosition(position);
+                return null;
+            }
+        }.execute();
+    }
+
+    public Position selectPosition() {
         Position position = new Position();
 
         Cursor cursor = db.rawQuery("SELECT * FROM position ORDER BY id LIMIT 1", null);
@@ -96,10 +146,29 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         return position;
     }
 
-    public void deletePosition(SQLiteDatabase db, long id) {
+    public void selectPositionAsync(DatabaseHandler<Position> handler) {
+        new DatabaseAsyncTask<Position>(handler) {
+            @Override
+            protected Position executeMethod() {
+                return selectPosition();
+            }
+        }.execute();
+    }
+
+    public void deletePosition(long id) {
         if (db.delete("position", "id = ?", new String[] { String.valueOf(id) }) != 1) {
             throw new SQLException();
         }
     }
 
+    public void deletePositionAsync(final long id, DatabaseHandler<Void> handler) {
+        new DatabaseAsyncTask<Void>(handler) {
+            @Override
+            protected Void executeMethod() {
+                deletePosition(id);
+                return null;
+            }
+        }.execute();
+    }
+
 }

app/src/main/java/org/traccar/client/TrackingController.java

@@ -25,6 +25,7 @@ public class TrackingController implements PositionProvider.PositionListener {
     private SharedPreferences preferences;
 
     private PositionProvider positionProvider;
+    private DatabaseHelper databaseHelper;
 
     public TrackingController(Context context) {
         this.context = context;
@@ -33,6 +34,7 @@ public class TrackingController implements PositionProvider.PositionListener {
                 preferences.getString(MainActivity.KEY_DEVICE, null),
                 preferences.getString(MainActivity.KEY_PROVIDER, null),
                 Integer.parseInt(preferences.getString(MainActivity.KEY_INTERVAL, null)) * 1000);
+        databaseHelper = new DatabaseHelper(context);
     }
 
     public void start() {
@@ -48,6 +50,8 @@ public class TrackingController implements PositionProvider.PositionListener {
         if (position != null) {
             StatusActivity.addMessage(context.getString(R.string.status_location_update));
 
+
+
             String request = ProtocolFormatter.formatRequest(
                     preferences.getString(MainActivity.KEY_ADDRESS, null),
                     Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null)),

app/src/test/java/org/traccar/client/DatabaseHelperTest.java

@@ -29,17 +29,17 @@ public class DatabaseHelperTest {
         Position position = new Position("123456789012345", new Location("gps"), 0);
         position.setTime(new Date(0));
 
-        assertNull(databaseHelper.selectPosition(db));
+        assertNull(databaseHelper.selectPosition());
 
-        databaseHelper.insertPosition(db, position);
+        databaseHelper.insertPosition(position);
 
-        position = databaseHelper.selectPosition(db);
+        position = databaseHelper.selectPosition();
 
         assertNotNull(position);
 
-        databaseHelper.deletePosition(db, position.getId());
+        databaseHelper.deletePosition(position.getId());
 
-        assertNull(databaseHelper.selectPosition(db));
+        assertNull(databaseHelper.selectPosition());
 
     }