From fb0babb3b8e30bf5e3dc29a286d13093dc861a54 Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Fri, 8 May 2020 02:32:26 +0200 Subject: [PATCH] Fix Database crash between v10 versions (#3345) --- .../shared/org/mozilla/vrbrowser/db/AppDatabase.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/db/AppDatabase.java b/app/src/common/shared/org/mozilla/vrbrowser/db/AppDatabase.java index aea6f5d06..bd1d5c99a 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/db/AppDatabase.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/db/AppDatabase.java @@ -13,7 +13,7 @@ import org.mozilla.vrbrowser.AppExecutors; -@Database(entities = {SitePermission.class}, version = 3) +@Database(entities = {SitePermission.class}, version = 4) public abstract class AppDatabase extends RoomDatabase { private static final String DATABASE_NAME = "app"; @@ -38,7 +38,7 @@ public static AppDatabase getAppDatabase(Context context, final AppExecutors exe @NonNull private static AppDatabase buildDatabase(final @NonNull Context appContext, final @NonNull AppExecutors executors) { return Room.databaseBuilder(appContext, AppDatabase.class, DATABASE_NAME) - .addMigrations(MIGRATION_1_2, MIGRATION_2_3) + .addMigrations(MIGRATION_1_2, MIGRATION_2_4) .addCallback(new Callback() { @Override public void onCreate(@NonNull SupportSQLiteDatabase db) { @@ -87,7 +87,8 @@ public void migrate(SupportSQLiteDatabase database) { } }; - private static final Migration MIGRATION_2_3 = new Migration(2, 3) { + // Note: We skip version 3 as a workaround to fix a crash between v10 releases + private static final Migration MIGRATION_2_4 = new Migration(2, 4) { @Override public void migrate(SupportSQLiteDatabase database) { database.execSQL("ALTER TABLE SitePermission ADD COLUMN principal TEXT NOT NULL DEFAULT ''");