Fix migration again.

LemmyNet · Dec 20, 2022 · fa89888 · fa89888
1 parent ac62498
commit fa89888
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@
 .externalNativeBuild
 .cxx
 local.properties
-app/release
 .project
 .settings
 .classpath
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,3 @@
-/build
+/build
+/release
+/schemas
diff --git a/app/src/main/java/com/jerboa/db/AppDB.kt b/app/src/main/java/com/jerboa/db/AppDB.kt
@@ -1,6 +1,8 @@
 package com.jerboa.db
 
+import android.content.ContentValues
 import android.content.Context
+import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
@@ -10,6 +12,7 @@ import androidx.room.*
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import kotlinx.coroutines.launch
+import java.util.concurrent.Executors
 
 @Entity
 data class Account(
@@ -147,7 +150,6 @@ val MIGRATION_2_3 = object : Migration(2, 3) {
                 NOT NULL DEFAULT 0)
             """
         )
-        database.execSQL("insert into AppSettings default values")
     }
 }
 
@@ -177,7 +179,23 @@ abstract class AppDB : RoomDatabase() {
                 )
                     .allowMainThreadQueries()
                     .addMigrations(MIGRATION_1_2, MIGRATION_2_3)
-                    .build()
+                    // Necessary because it can't insert data on creation
+                    .addCallback(object : Callback() {
+                        override fun onOpen(db: SupportSQLiteDatabase) {
+                            super.onCreate(db)
+                            Executors.newSingleThreadExecutor().execute {
+                                db.insert(
+                                    "AppSettings",
+                                    CONFLICT_IGNORE, // Ensures it won't overwrite the existing data
+                                    ContentValues(2).apply {
+                                        put("id", 1)
+                                        put("font_size", 13)
+                                        put("theme", 0)
+                                    }
+                                )
+                            }
+                        }
+                    }).build()
                 INSTANCE = instance
                 // return instance
                 instance