gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-02-01 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3396 from nextcloud/chore/Room260

Browse Source 
Bump room to 2.6.0
This commit is contained in:
Andy Scherzinger 2023-10-19 13:08:55 +02:00 committed by GitHub
commit 4ac66241f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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"

40
app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
View File

@ -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")
}
}