From a007af3db6ac64d18a0035ba302808f80fc68fb9 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 26 Oct 2018 12:56:53 +0200 Subject: [PATCH] Fix database upgrade --- app/build.gradle | 2 +- .../nextcloud/talk/application/NextcloudTalkApplication.java | 1 + .../java/com/nextcloud/talk/dagger/modules/DatabaseModule.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6eb076457..742a1b905 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -190,7 +190,7 @@ dependencies { implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.kevalpatel2106:emoticongifkeyboard:1.1' - compile 'uk.co.chrisjenx:calligraphy:2.3.0' + implementation 'uk.co.chrisjenx:calligraphy:2.3.0' testImplementation 'junit:junit:4.12' androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0-alpha4', { diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java index 067e55ef7..0ed02644e 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java @@ -32,6 +32,7 @@ import com.nextcloud.talk.jobs.AccountRemovalWorker; import com.nextcloud.talk.jobs.CapabilitiesWorker; import com.nextcloud.talk.jobs.PushRegistrationWorker; import com.nextcloud.talk.jobs.SignalingSettingsJob; +import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.utils.ClosedInterfaceImpl; import com.nextcloud.talk.utils.DeviceUtils; import com.nextcloud.talk.utils.DisplayUtils; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java index dd3c370f9..a8eb25cc1 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java @@ -49,7 +49,7 @@ public class DatabaseModule { return new SqlCipherDatabaseSource(context, Models.DEFAULT, context.getResources().getString(R.string.nc_app_name).toLowerCase() .replace(" ", "_").trim() + ".sqlite", - context.getString(R.string.nc_talk_database_encryption_key), 4); + context.getString(R.string.nc_talk_database_encryption_key), 5); } @Provides