From 357b580a8499c69f587e2181d3ede5bc56551ba4 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 19 Oct 2023 10:53:44 +0200
Subject: [PATCH] Bump room to 2.6.0 and rename paramter to match super class
in case of use of names paramters
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
app/build.gradle | 2 +-
.../talk/data/source/local/Migrations.kt | 40 +++++++++----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 6c5c55ebf..dc51c6c03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -149,7 +149,7 @@ ext {
parcelerVersion = "1.1.13"
prismVersion = "2.0.0"
retrofit2Version = "2.9.0"
- roomVersion = "2.5.2"
+ roomVersion = "2.6.0"
workVersion = "2.8.1"
espressoVersion = "3.5.1"
media3_version = "1.1.1"
diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
index 11ce9552f..aca16d0a6 100644
--- a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
@@ -27,28 +27,28 @@ import androidx.sqlite.db.SupportSQLiteDatabase
@Suppress("MagicNumber")
object Migrations {
val MIGRATION_6_8 = object : Migration(6, 8) {
- override fun migrate(database: SupportSQLiteDatabase) {
+ override fun migrate(db: SupportSQLiteDatabase) {
Log.i("Migrations", "Migrating 6 to 8")
- migrateToRoom(database)
+ migrateToRoom(db)
}
}
val MIGRATION_7_8 = object : Migration(7, 8) {
- override fun migrate(database: SupportSQLiteDatabase) {
+ override fun migrate(db: SupportSQLiteDatabase) {
Log.i("Migrations", "Migrating 7 to 8")
- migrateToRoom(database)
+ migrateToRoom(db)
}
}
val MIGRATION_8_9 = object : Migration(8, 9) {
- override fun migrate(database: SupportSQLiteDatabase) {
+ override fun migrate(db: SupportSQLiteDatabase) {
Log.i("Migrations", "Migrating 8 to 9")
- migrateToDualPrimaryKeyArbitraryStorage(database)
+ migrateToDualPrimaryKeyArbitraryStorage(db)
}
}
- fun migrateToRoom(database: SupportSQLiteDatabase) {
- database.execSQL(
+ fun migrateToRoom(db: SupportSQLiteDatabase) {
+ db.execSQL(
"CREATE TABLE User_new (" +
"id INTEGER NOT NULL, " +
"userId TEXT, " +
@@ -65,7 +65,7 @@ object Migrations {
"PRIMARY KEY(id)" +
")"
)
- database.execSQL(
+ db.execSQL(
"CREATE TABLE ArbitraryStorage_new (" +
"accountIdentifier INTEGER NOT NULL, " +
"\"key\" TEXT, " +
@@ -75,7 +75,7 @@ object Migrations {
")"
)
// Copy the data
- database.execSQL(
+ db.execSQL(
"INSERT INTO User_new (" +
"id, userId, username, baseUrl, token, displayName, pushConfigurationState, capabilities, " +
"clientCertificate, externalSignalingServer, current, scheduledForDeletion) " +
@@ -84,7 +84,7 @@ object Migrations {
"clientCertificate, externalSignalingServer, current, scheduledForDeletion " +
"FROM User"
)
- database.execSQL(
+ db.execSQL(
"INSERT INTO ArbitraryStorage_new (" +
"accountIdentifier, \"key\", object, value) " +
"SELECT " +
@@ -92,16 +92,16 @@ object Migrations {
"FROM ArbitraryStorage"
)
// Remove the old table
- database.execSQL("DROP TABLE User")
- database.execSQL("DROP TABLE ArbitraryStorage")
+ db.execSQL("DROP TABLE User")
+ db.execSQL("DROP TABLE ArbitraryStorage")
// Change the table name to the correct one
- database.execSQL("ALTER TABLE User_new RENAME TO User")
- database.execSQL("ALTER TABLE ArbitraryStorage_new RENAME TO ArbitraryStorage")
+ db.execSQL("ALTER TABLE User_new RENAME TO User")
+ db.execSQL("ALTER TABLE ArbitraryStorage_new RENAME TO ArbitraryStorage")
}
- fun migrateToDualPrimaryKeyArbitraryStorage(database: SupportSQLiteDatabase) {
- database.execSQL(
+ fun migrateToDualPrimaryKeyArbitraryStorage(db: SupportSQLiteDatabase) {
+ db.execSQL(
"CREATE TABLE ArbitraryStorage_dualPK (" +
"accountIdentifier INTEGER NOT NULL, " +
"\"key\" TEXT NOT NULL, " +
@@ -111,7 +111,7 @@ object Migrations {
")"
)
// Copy the data
- database.execSQL(
+ db.execSQL(
"INSERT INTO ArbitraryStorage_dualPK (" +
"accountIdentifier, \"key\", object, value) " +
"SELECT " +
@@ -119,9 +119,9 @@ object Migrations {
"FROM ArbitraryStorage"
)
// Remove the old table
- database.execSQL("DROP TABLE ArbitraryStorage")
+ db.execSQL("DROP TABLE ArbitraryStorage")
// Change the table name to the correct one
- database.execSQL("ALTER TABLE ArbitraryStorage_dualPK RENAME TO ArbitraryStorage")
+ db.execSQL("ALTER TABLE ArbitraryStorage_dualPK RENAME TO ArbitraryStorage")
}
}