Сравнить коммиты

..
2 Коммитов
Автор SHA1 Сообщение Дата
Anton Tananaev 94e094e648 Update app version 2021-07-24 11:24:26 -07:00
Anton Tananaev 25c0434e4c Fix database management 2021-07-24 11:23:58 -07:00
3 изменённых файлов: 10 добавлений и 10 удалений
+2 -2
Просмотреть файл
@@ -9,8 +9,8 @@ android {
buildConfigField 'boolean', 'HIDDEN_APP', 'false'
minSdkVersion 16
targetSdkVersion 30
versionCode 71
versionName '6.10'
versionCode 72
versionName '6.11'
multiDexEnabled true
}
+4 -4
Просмотреть файл
@@ -30,7 +30,7 @@ class DatabaseHelper(context: Context?) : SQLiteOpenHelper(context, DATABASE_NAM
fun onComplete(success: Boolean, result: T)
}
private abstract class DatabaseAsyncTask<T>(val handler: DatabaseHandler<T>) : AsyncTask<Unit, Unit, T?>() {
private abstract class DatabaseAsyncTask<T>(val handler: DatabaseHandler<T?>) : AsyncTask<Unit, Unit, T?>() {
private var error: RuntimeException? = null
@@ -46,7 +46,7 @@ class DatabaseHelper(context: Context?) : SQLiteOpenHelper(context, DATABASE_NAM
protected abstract fun executeMethod(): T
override fun onPostExecute(result: T?) {
result?.let { handler.onComplete(error == null, result) }
handler.onComplete(error == null, result)
}
}
@@ -94,7 +94,7 @@ class DatabaseHelper(context: Context?) : SQLiteOpenHelper(context, DATABASE_NAM
db.insertOrThrow("position", null, values)
}
fun insertPositionAsync(position: Position, handler: DatabaseHandler<Unit>) {
fun insertPositionAsync(position: Position, handler: DatabaseHandler<Unit?>) {
object : DatabaseAsyncTask<Unit>(handler) {
override fun executeMethod() {
insertPosition(position)
@@ -138,7 +138,7 @@ class DatabaseHelper(context: Context?) : SQLiteOpenHelper(context, DATABASE_NAM
}
}
fun deletePositionAsync(id: Long, handler: DatabaseHandler<Unit>) {
fun deletePositionAsync(id: Long, handler: DatabaseHandler<Unit?>) {
object : DatabaseAsyncTask<Unit>(handler) {
override fun executeMethod() {
deletePosition(id)
+4 -4
Просмотреть файл
@@ -104,8 +104,8 @@ class TrackingController(private val context: Context) : PositionListener, Netwo
private fun write(position: Position) {
log("write", position)
databaseHelper.insertPositionAsync(position, object : DatabaseHandler<Unit> {
override fun onComplete(success: Boolean, result: Unit) {
databaseHelper.insertPositionAsync(position, object : DatabaseHandler<Unit?> {
override fun onComplete(success: Boolean, result: Unit?) {
if (success) {
if (isOnline && isWaiting) {
read()
@@ -139,8 +139,8 @@ class TrackingController(private val context: Context) : PositionListener, Netwo
private fun delete(position: Position) {
log("delete", position)
databaseHelper.deletePositionAsync(position.id, object : DatabaseHandler<Unit> {
override fun onComplete(success: Boolean, result: Unit) {
databaseHelper.deletePositionAsync(position.id, object : DatabaseHandler<Unit?> {
override fun onComplete(success: Boolean, result: Unit?) {
if (success) {
read()
} else {