From 0e75143508693708beb3b6a8b3b76132f62a0dbf Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 13 Jun 2018 15:23:23 +0200
Subject: [PATCH] Fixed bug where Room would crash the app
---
app/build.gradle.kts | 2 +-
app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt | 4 ----
persistence/build.gradle.kts | 2 +-
.../de/kuschku/quasseldroid/persistence/QuasselDatabase.kt | 1 -
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 56d1cf866..65975e6ff 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -133,7 +133,7 @@ dependencies {
}
// App Arch Persistence
- withVersion("1.1.0") {
+ withVersion("1.1.1-rc1") {
implementation("android.arch.persistence.room", "runtime", version)
kapt("android.arch.persistence.room", "compiler", version)
implementation("android.arch.persistence.room", "rxjava2", version)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt b/app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt
index 64c357aca..74382421d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt
@@ -157,10 +157,6 @@ class Quasseldroid : DaggerApplication() {
)
).migrate(this)
- // Initialize databases to run migrations
- QuasselDatabase.Creator.init(this)
- AccountDatabase.Creator.init(this)
-
// Initialize preferences unless already set
/*
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index b6b358730..7132dc4d5 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -60,7 +60,7 @@ dependencies {
}
// App Arch Persistence
- withVersion("1.1.0") {
+ withVersion("1.1.1-rc1") {
implementation("android.arch.persistence.room", "runtime", version)
kapt("android.arch.persistence.room", "compiler", version)
implementation("android.arch.persistence.room", "rxjava2", version)
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
index bfdf400e4..d7d9e9056 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
@@ -323,7 +323,6 @@ abstract class QuasselDatabase : RoomDatabase() {
},
object : Migration(14, 15) {
override fun migrate(database: SupportSQLiteDatabase) {
- database.execSQL("DELETE FROM message;")
database.execSQL("ALTER TABLE message ADD networkId INT DEFAULT 0 NOT NULL;")
}
}
--
GitLab