Migrate websearches to search actions

database/schemas/de.mm20.launcher2.database.AppDatabase/19.json

@@ -0,0 +1,468 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 19,
+    "identityHash": "c6adf1dca8ade5117d4e8952a67786fa",
+    "entities": [
+      {
+        "tableName": "forecasts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`timestamp` INTEGER NOT NULL, `temperature` REAL NOT NULL, `minTemp` REAL NOT NULL, `maxTemp` REAL NOT NULL, `pressure` REAL NOT NULL, `humidity` REAL NOT NULL, `icon` INTEGER NOT NULL, `condition` TEXT NOT NULL, `clouds` INTEGER NOT NULL, `windSpeed` REAL NOT NULL, `windDirection` REAL NOT NULL, `rain` REAL NOT NULL, `snow` REAL NOT NULL, `night` INTEGER NOT NULL, `location` TEXT NOT NULL, `provider` TEXT NOT NULL, `providerUrl` TEXT NOT NULL, `rainProbability` INTEGER NOT NULL, `snowProbability` INTEGER NOT NULL, `updateTime` INTEGER NOT NULL, PRIMARY KEY(`timestamp`))",
+        "fields": [
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "temperature",
+            "columnName": "temperature",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minTemp",
+            "columnName": "minTemp",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxTemp",
+            "columnName": "maxTemp",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pressure",
+            "columnName": "pressure",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "humidity",
+            "columnName": "humidity",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "condition",
+            "columnName": "condition",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clouds",
+            "columnName": "clouds",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "windSpeed",
+            "columnName": "windSpeed",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "windDirection",
+            "columnName": "windDirection",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "precipitation",
+            "columnName": "rain",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "snow",
+            "columnName": "snow",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "night",
+            "columnName": "night",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "location",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "provider",
+            "columnName": "provider",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "providerUrl",
+            "columnName": "providerUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "precipProbability",
+            "columnName": "rainProbability",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "snowProbability",
+            "columnName": "snowProbability",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "timestamp"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Searchable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `type` TEXT NOT NULL, `searchable` TEXT NOT NULL, `launchCount` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `hidden` INTEGER NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "serializedSearchable",
+            "columnName": "searchable",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "launchCount",
+            "columnName": "launchCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinPosition",
+            "columnName": "pinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hidden",
+            "columnName": "hidden",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Currency",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`symbol` TEXT NOT NULL, `value` REAL NOT NULL, `lastUpdate` INTEGER NOT NULL, PRIMARY KEY(`symbol`))",
+        "fields": [
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastUpdate",
+            "columnName": "lastUpdate",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "symbol"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Icons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`type` TEXT NOT NULL, `componentName` TEXT, `drawable` TEXT, `iconPack` TEXT NOT NULL, `scale` REAL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "componentName",
+            "columnName": "componentName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "drawable",
+            "columnName": "drawable",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "iconPack",
+            "columnName": "iconPack",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scale",
+            "columnName": "scale",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "IconPack",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `packageName` TEXT NOT NULL, `version` TEXT NOT NULL, `scale` REAL NOT NULL, PRIMARY KEY(`packageName`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scale",
+            "columnName": "scale",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "packageName"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Widget",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`type` TEXT NOT NULL, `data` TEXT NOT NULL, `height` INTEGER NOT NULL, `position` INTEGER NOT NULL, `label` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "height",
+            "columnName": "height",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CustomAttributes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `type` TEXT NOT NULL, `value` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SearchAction",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`position` INTEGER NOT NULL, `type` TEXT NOT NULL, `data` TEXT NOT NULL, `label` TEXT, `icon` INTEGER NOT NULL, `color` INTEGER NOT NULL, `customIcon` TEXT, `options` TEXT, PRIMARY KEY(`position`))",
+        "fields": [
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customIcon",
+            "columnName": "customIcon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "options",
+            "columnName": "options",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "position"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c6adf1dca8ade5117d4e8952a67786fa')"
+    ]
+  }
+}

database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt

@@ -7,18 +7,34 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import de.mm20.launcher2.database.entities.*
+import de.mm20.launcher2.database.migrations.Migration_10_11
+import de.mm20.launcher2.database.migrations.Migration_11_12
+import de.mm20.launcher2.database.migrations.Migration_12_13
+import de.mm20.launcher2.database.migrations.Migration_13_14
+import de.mm20.launcher2.database.migrations.Migration_14_15
+import de.mm20.launcher2.database.migrations.Migration_15_16
+import de.mm20.launcher2.database.migrations.Migration_16_17
+import de.mm20.launcher2.database.migrations.Migration_17_18
+import de.mm20.launcher2.database.migrations.Migration_18_19
+import de.mm20.launcher2.database.migrations.Migration_6_7
+import de.mm20.launcher2.database.migrations.Migration_7_8
+import de.mm20.launcher2.database.migrations.Migration_8_9
+import de.mm20.launcher2.database.migrations.Migration_9_10
 
-@Database(entities = [ForecastEntity::class,
-    SavedSearchableEntity::class,
-    WebsearchEntity::class,
-    CurrencyEntity::class,
-    IconEntity::class,
-    IconPackEntity::class,
-    WidgetEntity::class,
-    CustomAttributeEntity::class], version = 18, exportSchema = true)
+@Database(
+    entities = [
+        ForecastEntity::class,
+        SavedSearchableEntity::class,
+        CurrencyEntity::class,
+        IconEntity::class,
+        IconPackEntity::class,
+        WidgetEntity::class,
+        CustomAttributeEntity::class,
+        SearchActionEntity::class,
+    ], version = 19, exportSchema = true
+)
 @TypeConverters(ComponentNameConverter::class, StringListConverter::class)
 abstract class AppDatabase : RoomDatabase() {
 
@@ -34,154 +50,47 @@ abstract class AppDatabase : RoomDatabase() {
         private var _instance: AppDatabase? = null
         fun getInstance(context: Context): AppDatabase {
             val instance = _instance
-                    ?: Room.databaseBuilder(context.applicationContext, AppDatabase::class.java, "room")
-                            //.fallbackToDestructiveMigration()
-                            .addCallback(object : Callback() {
-                                override fun onCreate(db: SupportSQLiteDatabase) {
-                                    super.onCreate(db)
-                                    db.execSQL("INSERT INTO Websearch (urlTemplate, label, color, icon) VALUES " +
-                                            "('${context.getString(R.string.default_websearch_1_url)}', '${context.getString(R.string.default_websearch_1_name)}', 0, NULL )," +
-                                            "('${context.getString(R.string.default_websearch_2_url)}', '${context.getString(R.string.default_websearch_2_name)}', 0, NULL )," +
-                                            "('${context.getString(R.string.default_websearch_3_url)}', '${context.getString(R.string.default_websearch_3_name)}', 0, NULL );")
+                ?: Room.databaseBuilder(context.applicationContext, AppDatabase::class.java, "room")
+                    //.fallbackToDestructiveMigration()
+                    .addCallback(object : Callback() {
+                        override fun onCreate(db: SupportSQLiteDatabase) {
+                            super.onCreate(db)
 
-                                    db.execSQL("INSERT INTO Widget (type, data, height, position, label) VALUES " +
-                                            "('internal', 'weather', -1, 0, '${context.getString(R.string.widget_name_weather)}')," +
-                                            "('internal', 'music', -1, 1, '${context.getString(R.string.widget_name_music)}')," +
-                                            "('internal', 'calendar', -1, 2, '${context.getString(R.string.widget_name_calendar)}');")
-                                }
-                            })
-                            .addMigrations(
-                                    Migration_6_7(),
-                                    Migration_7_8(),
-                                    Migration_8_9(),
-                                    Migration_9_10(),
-                                    Migration_10_11(),
-                                    Migration_11_12(),
-                                    Migration_12_13(),
-                                    Migration_13_14(),
-                                    Migration_14_15(),
-                                    Migration_15_16(),
-                                    Migration_16_17(),
-                                    Migration_17_18(),
-                            ).build()
+                            db.execSQL("INSERT INTO `SearchAction` (`position`, `type`, `data`, `label`, `color`, `icon`, `customIcon`, `options`) " +
+                                    "VALUES (?, ?, ?, ?, ?, ?, ?, ?), (?, ?, ?, ?, ?, ?, ?, ?), (?, ?, ?, ?, ?, ?, ?, ?)",
+                                arrayOf(
+                                    0, "url", context.getString(R.string.default_websearch_1_url), context.getString(R.string.default_websearch_1_name), 0, 0, null, null,
+                                    0, "url", context.getString(R.string.default_websearch_2_url), context.getString(R.string.default_websearch_2_name), 0, 0, null, null,
+                                    0, "url", context.getString(R.string.default_websearch_3_url), context.getString(R.string.default_websearch_3_name), 0, 0, null, null,
+                                )
+                            )
+
+                            db.execSQL(
+                                "INSERT INTO Widget (type, data, height, position, label) VALUES " +
+                                        "('internal', 'weather', -1, 0, '${context.getString(R.string.widget_name_weather)}')," +
+                                        "('internal', 'music', -1, 1, '${context.getString(R.string.widget_name_music)}')," +
+                                        "('internal', 'calendar', -1, 2, '${context.getString(R.string.widget_name_calendar)}');"
+                            )
+                        }
+                    })
+                    .addMigrations(
+                        Migration_6_7(),
+                        Migration_7_8(),
+                        Migration_8_9(),
+                        Migration_9_10(),
+                        Migration_10_11(),
+                        Migration_11_12(),
+                        Migration_12_13(),
+                        Migration_13_14(),
+                        Migration_14_15(),
+                        Migration_15_16(),
+                        Migration_16_17(),
+                        Migration_17_18(),
+                        Migration_18_19(),
+                    ).build()
             if (_instance == null) _instance = instance
             return instance
         }
     }
 }
 
-class Migration_6_7 : Migration(6, 7) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE Searchable2 (`key` TEXT NOT NULL, `searchable` TEXT, `launchCount` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `hidden` INTEGER NOT NULL, `inAllApps` INTEGER NOT NULL, PRIMARY KEY(`key`))")
-        database.execSQL("INSERT INTO Searchable2 SELECT * FROM Searchable")
-        database.execSQL("DROP TABLE Searchable")
-        database.execSQL("ALTER TABLE Searchable2 RENAME TO Searchable")
-    }
-
-}
-
-class Migration_7_8 : Migration(7, 8) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `${ForecastEntity.TABLE_NAME}2` (`timestamp` INTEGER NOT NULL, `temperature` REAL NOT NULL, `minTemp` REAL NOT NULL, `maxTemp` REAL NOT NULL, `pressure` REAL NOT NULL, `humidity` REAL NOT NULL, `icon` INTEGER NOT NULL, `condition` TEXT NOT NULL, `clouds` INTEGER NOT NULL, `windSpeed` REAL NOT NULL, `windDirection` REAL NOT NULL, `rain` REAL NOT NULL, `snow` REAL NOT NULL, `night` INTEGER NOT NULL, `location` TEXT NOT NULL, `provider` TEXT NOT NULL, `providerUrl` TEXT NOT NULL, `rainPropability` INTEGER NOT NULL, `snowProbability` INTEGER NOT NULL, PRIMARY KEY(`timestamp`))")
-        database.execSQL("INSERT INTO ${ForecastEntity.TABLE_NAME}2 SELECT *, -1 as rainPropability, -1 as snowPropability FROM ${ForecastEntity.TABLE_NAME}")
-        database.execSQL("DROP TABLE ${ForecastEntity.TABLE_NAME}")
-        database.execSQL("ALTER TABLE ${ForecastEntity.TABLE_NAME}2 RENAME TO ${ForecastEntity.TABLE_NAME}")
-    }
-}
-
-class Migration_8_9 : Migration(8, 9) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `${ForecastEntity.TABLE_NAME}2` (" +
-                "`timestamp` INTEGER NOT NULL, " +
-                "`temperature` REAL NOT NULL, " +
-                "`minTemp` REAL NOT NULL, " +
-                "`maxTemp` REAL NOT NULL, " +
-                "`pressure` REAL NOT NULL, " +
-                "`humidity` REAL NOT NULL, " +
-                "`icon` INTEGER NOT NULL, " +
-                "`condition` TEXT NOT NULL, " +
-                "`clouds` INTEGER NOT NULL, " +
-                "`windSpeed` REAL NOT NULL, " +
-                "`windDirection` REAL NOT NULL, " +
-                "`rain` REAL NOT NULL, " +
-                "`snow` REAL NOT NULL, " +
-                "`night` INTEGER NOT NULL, " +
-                "`location` TEXT NOT NULL, " +
-                "`provider` TEXT NOT NULL, " +
-                "`providerUrl` TEXT NOT NULL, " +
-                "`rainProbability` INTEGER NOT NULL, " +
-                "`snowProbability` INTEGER NOT NULL, " +
-                "`updateTime` INTEGER NOT NULL, " +
-                "PRIMARY KEY(`timestamp`))")
-        database.execSQL("INSERT INTO ${ForecastEntity.TABLE_NAME}2 SELECT timestamp, temperature, minTemp, maxTemp, pressure, humidity, icon, condition, clouds, windSpeed, windDirection, rain, snow, night, location, provider, providerUrl, rainPropability as rainProbability, snowProbability, 0 as updateTime FROM ${ForecastEntity.TABLE_NAME}")
-        database.execSQL("DROP TABLE ${ForecastEntity.TABLE_NAME}")
-        database.execSQL("ALTER TABLE ${ForecastEntity.TABLE_NAME}2 RENAME TO ${ForecastEntity.TABLE_NAME}")
-    }
-
-}
-
-class Migration_9_10 : Migration(9, 10) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Plugins` (`packageName` TEXT NOT NULL, `label` TEXT NOT NULL, `description` TEXT NOT NULL, `pluginClassName` TEXT NOT NULL, `enabled` INTEGER NOT NULL, PRIMARY KEY(`packageName`) );")
-    }
-
-}
-
-class Migration_10_11 : Migration(10, 11) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `temp` (`key` TEXT NOT NULL, `searchable` TEXT NOT NULL, `launchCount` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `hidden` INTEGER NOT NULL, PRIMARY KEY(`key`))")
-        database.execSQL("INSERT INTO `temp` SELECT `key`, `searchable`, `launchCount`, `pinned`, `hidden` FROM `Searchable`")
-        database.execSQL("DROP TABLE `Searchable`")
-        database.execSQL("ALTER TABLE `temp` RENAME TO `Searchable`")
-    }
-}
-
-class Migration_11_12 : Migration(11, 12) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Currency` (`symbol` TEXT NOT NULL, `value` REAL NOT NULL, `lastUpdate` INTEGER NOT NULL, PRIMARY KEY(`symbol`))")
-    }
-}
-
-class Migration_12_13 : Migration(12, 13) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Plugin` (`packageName` TEXT NOT NULL, `data` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`packageName`, `data`))")
-    }
-}
-class Migration_13_14 : Migration(13, 14) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS `Plugins`;")
-    }
-}
-class Migration_14_15 : Migration(14, 15) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-    }
-}
-class Migration_15_16 : Migration(15, 16) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS `CustomAttributes` (
-                `key` TEXT NOT NULL,
-                `type` TEXT NOT NULL,
-                `value` TEXT NOT NULL,
-                `id` INTEGER PRIMARY KEY AUTOINCREMENT
-            )
-            """.trimIndent())
-    }
-}
-
-class Migration_16_17 : Migration(16, 17) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Websearch ADD COLUMN encoding INTEGER")
-    }
-}
-
-class Migration_17_18: Migration(17, 18) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Searchable ADD COLUMN type TEXT NOT NULL DEFAULT ''")
-        database.execSQL("""
-            UPDATE Searchable
-            SET type = SUBSTR(`key`, 0, INSTR(`key`, '://')),
-            searchable = SUBSTR(`searchable`, INSTR(`searchable`, '#') + 1)
-            """.trimIndent())
-    }
-}

database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt

@@ -6,6 +6,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import de.mm20.launcher2.database.entities.CustomAttributeEntity
 import de.mm20.launcher2.database.entities.SavedSearchableEntity
+import de.mm20.launcher2.database.entities.SearchActionEntity
 import de.mm20.launcher2.database.entities.WebsearchEntity
 import de.mm20.launcher2.database.entities.WidgetEntity
 
@@ -30,14 +31,14 @@ interface BackupRestoreDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun importWidgets(items: List<WidgetEntity>)
 
-    @Query("DELETE FROM Websearch")
-    suspend fun wipeWebsearches()
+    @Query("DELETE FROM SearchAction")
+    suspend fun wipeSearchActions()
 
-    @Query("SELECT * FROM Websearch LIMIT :limit OFFSET :offset")
-    suspend fun exportWebsearches(limit: Int, offset: Int): List<WebsearchEntity>
+    @Query("SELECT * FROM SearchAction LIMIT :limit OFFSET :offset")
+    suspend fun exportSearchActions(limit: Int, offset: Int): List<SearchActionEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun importWebsearches(items: List<WebsearchEntity>)
+    suspend fun importSearchActions(items: List<SearchActionEntity>)
 
     @Query("DELETE FROM CustomAttributes")
     suspend fun wipeCustomAttributes()

database/src/main/java/de/mm20/launcher2/database/SearchDao.kt

@@ -2,7 +2,6 @@ package de.mm20.launcher2.database
 
 import androidx.room.*
 import de.mm20.launcher2.database.entities.SavedSearchableEntity
-import de.mm20.launcher2.database.entities.WebsearchEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -114,18 +113,6 @@ interface SearchDao {
     @Query("SELECT * FROM SEARCHABLE WHERE hidden = 1")
     fun getHiddenItems(): Flow<List<SavedSearchableEntity>>
 
-    @Query("SELECT * FROM Websearch ORDER BY label ASC")
-    fun getWebSearches(): Flow<List<WebsearchEntity>>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertWebsearch(websearch: WebsearchEntity)
-
-    @Delete
-    fun deleteWebsearch(websearch: WebsearchEntity)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllWebsearches(websearches: List<WebsearchEntity>)
-
     @Query("UPDATE Searchable SET launchCount = launchCount + 1 WHERE `key` = :key")
     fun incrementExistingLaunchCount(key: String)
 

database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt

@@ -1,8 +1,16 @@
 package de.mm20.launcher2.database.entities
 
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "SearchAction")
 data class SearchActionEntity(
+    @PrimaryKey val position: Int,
     val type: String,
-    val data: String? = null,
+    val data: String,
+    val label: String?,
+    val icon: Int,
+    val color: Int = 0,
+    val customIcon: String? = null,
     val options: String? = null,
-    val position: Int,
 )

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt

@@ -0,0 +1,13 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_10_11 : Migration(10, 11) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `temp` (`key` TEXT NOT NULL, `searchable` TEXT NOT NULL, `launchCount` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `hidden` INTEGER NOT NULL, PRIMARY KEY(`key`))")
+        database.execSQL("INSERT INTO `temp` SELECT `key`, `searchable`, `launchCount`, `pinned`, `hidden` FROM `Searchable`")
+        database.execSQL("DROP TABLE `Searchable`")
+        database.execSQL("ALTER TABLE `temp` RENAME TO `Searchable`")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt

@@ -0,0 +1,10 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_11_12 : Migration(11, 12) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Currency` (`symbol` TEXT NOT NULL, `value` REAL NOT NULL, `lastUpdate` INTEGER NOT NULL, PRIMARY KEY(`symbol`))")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt

@@ -0,0 +1,10 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_12_13 : Migration(12, 13) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Plugin` (`packageName` TEXT NOT NULL, `data` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`packageName`, `data`))")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt

@@ -0,0 +1,10 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_13_14 : Migration(13, 14) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS `Plugins`;")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt

@@ -0,0 +1,9 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_14_15 : Migration(14, 15) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt

@@ -0,0 +1,19 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_15_16 : Migration(15, 16) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `CustomAttributes` (
+                `key` TEXT NOT NULL,
+                `type` TEXT NOT NULL,
+                `value` TEXT NOT NULL,
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT
+            )
+            """.trimIndent()
+        )
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt

@@ -0,0 +1,10 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_16_17 : Migration(16, 17) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Websearch ADD COLUMN encoding INTEGER")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt

@@ -0,0 +1,17 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_17_18 : Migration(17, 18) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Searchable ADD COLUMN type TEXT NOT NULL DEFAULT ''")
+        database.execSQL(
+            """
+            UPDATE Searchable
+            SET type = SUBSTR(`key`, 0, INSTR(`key`, '://')),
+            searchable = SUBSTR(`searchable`, INSTR(`searchable`, '#') + 1)
+            """.trimIndent()
+        )
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt

@@ -0,0 +1,44 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.core.database.getStringOrNull
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import de.mm20.launcher2.ktx.jsonObjectOf
+
+class Migration_18_19 : Migration(18, 19) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        val websearches =
+            database.query("SELECT label, urlTemplate, color, icon, encoding FROM `Websearch` ORDER BY label ASC")
+        database.execSQL("CREATE TABLE IF NOT EXISTS `SearchAction` (`position` INTEGER NOT NULL, `type` TEXT NOT NULL, `data` TEXT NOT NULL, `label` TEXT, `icon` INTEGER NOT NULL, `color` INTEGER NOT NULL, `customIcon` TEXT, `options` TEXT, PRIMARY KEY(`position`))"
+        )
+        var position = 0
+        while (websearches.moveToNext()) {
+            val label = websearches.getString(0)
+            val data = websearches.getString(1)
+            val color = websearches.getInt(2)
+            val icon = websearches.getStringOrNull(3)
+            val encoding = websearches.getStringOrNull(4)
+
+            val options = encoding?.let{
+                jsonObjectOf("encoding" to encoding).toString()
+            }
+
+            database.execSQL(
+                "INSERT INTO `SearchAction` (`position`, `type`, `data`, `label`, `color`, `icon`, `customIcon`, `options`)" +
+                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+                arrayOf(
+                    position,
+                    "url",
+                    data,
+                    label,
+                    color,
+                    if (icon == null) 0 else 1,
+                    icon,
+                    options
+                )
+            )
+            position++
+        }
+        database.execSQL("DROP TABLE `Websearch`")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt

@@ -0,0 +1,14 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_6_7 : Migration(6, 7) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE Searchable2 (`key` TEXT NOT NULL, `searchable` TEXT, `launchCount` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `hidden` INTEGER NOT NULL, `inAllApps` INTEGER NOT NULL, PRIMARY KEY(`key`))")
+        database.execSQL("INSERT INTO Searchable2 SELECT * FROM Searchable")
+        database.execSQL("DROP TABLE Searchable")
+        database.execSQL("ALTER TABLE Searchable2 RENAME TO Searchable")
+    }
+
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt

@@ -0,0 +1,14 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import de.mm20.launcher2.database.entities.ForecastEntity
+
+class Migration_7_8 : Migration(7, 8) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `${ForecastEntity.TABLE_NAME}2` (`timestamp` INTEGER NOT NULL, `temperature` REAL NOT NULL, `minTemp` REAL NOT NULL, `maxTemp` REAL NOT NULL, `pressure` REAL NOT NULL, `humidity` REAL NOT NULL, `icon` INTEGER NOT NULL, `condition` TEXT NOT NULL, `clouds` INTEGER NOT NULL, `windSpeed` REAL NOT NULL, `windDirection` REAL NOT NULL, `rain` REAL NOT NULL, `snow` REAL NOT NULL, `night` INTEGER NOT NULL, `location` TEXT NOT NULL, `provider` TEXT NOT NULL, `providerUrl` TEXT NOT NULL, `rainPropability` INTEGER NOT NULL, `snowProbability` INTEGER NOT NULL, PRIMARY KEY(`timestamp`))")
+        database.execSQL("INSERT INTO ${ForecastEntity.TABLE_NAME}2 SELECT *, -1 as rainPropability, -1 as snowPropability FROM ${ForecastEntity.TABLE_NAME}")
+        database.execSQL("DROP TABLE ${ForecastEntity.TABLE_NAME}")
+        database.execSQL("ALTER TABLE ${ForecastEntity.TABLE_NAME}2 RENAME TO ${ForecastEntity.TABLE_NAME}")
+    }
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt

@@ -0,0 +1,38 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import de.mm20.launcher2.database.entities.ForecastEntity
+
+class Migration_8_9 : Migration(8, 9) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `${ForecastEntity.TABLE_NAME}2` (" +
+                    "`timestamp` INTEGER NOT NULL, " +
+                    "`temperature` REAL NOT NULL, " +
+                    "`minTemp` REAL NOT NULL, " +
+                    "`maxTemp` REAL NOT NULL, " +
+                    "`pressure` REAL NOT NULL, " +
+                    "`humidity` REAL NOT NULL, " +
+                    "`icon` INTEGER NOT NULL, " +
+                    "`condition` TEXT NOT NULL, " +
+                    "`clouds` INTEGER NOT NULL, " +
+                    "`windSpeed` REAL NOT NULL, " +
+                    "`windDirection` REAL NOT NULL, " +
+                    "`rain` REAL NOT NULL, " +
+                    "`snow` REAL NOT NULL, " +
+                    "`night` INTEGER NOT NULL, " +
+                    "`location` TEXT NOT NULL, " +
+                    "`provider` TEXT NOT NULL, " +
+                    "`providerUrl` TEXT NOT NULL, " +
+                    "`rainProbability` INTEGER NOT NULL, " +
+                    "`snowProbability` INTEGER NOT NULL, " +
+                    "`updateTime` INTEGER NOT NULL, " +
+                    "PRIMARY KEY(`timestamp`))"
+        )
+        database.execSQL("INSERT INTO ${ForecastEntity.TABLE_NAME}2 SELECT timestamp, temperature, minTemp, maxTemp, pressure, humidity, icon, condition, clouds, windSpeed, windDirection, rain, snow, night, location, provider, providerUrl, rainPropability as rainProbability, snowProbability, 0 as updateTime FROM ${ForecastEntity.TABLE_NAME}")
+        database.execSQL("DROP TABLE ${ForecastEntity.TABLE_NAME}")
+        database.execSQL("ALTER TABLE ${ForecastEntity.TABLE_NAME}2 RENAME TO ${ForecastEntity.TABLE_NAME}")
+    }
+
+}

database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt

@@ -0,0 +1,11 @@
+package de.mm20.launcher2.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration_9_10 : Migration(9, 10) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Plugins` (`packageName` TEXT NOT NULL, `label` TEXT NOT NULL, `description` TEXT NOT NULL, `pluginClassName` TEXT NOT NULL, `enabled` INTEGER NOT NULL, PRIMARY KEY(`packageName`) );")
+    }
+
+}