Skip to content

Update Room library to 2.6.1 #4370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release/4.0
Choose a base branch
from
Open

Update Room library to 2.6.1 #4370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d15e32f
Update Room library to 2.6.1
TranceLove Mar 2, 2025
edf6713
Merge branch 'release/4.0' into feature/room-2.6
EmmanuelMess May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 101 additions & 2 deletions app/src/main/java/com/amaze/filemanager/database/ExplorerDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ abstract class ExplorerDatabase : RoomDatabase() {

companion object {
private const val DATABASE_NAME = "explorer.db"
const val DATABASE_VERSION = 11
const val DATABASE_VERSION = 12
const val TABLE_TAB = "tab"
const val TABLE_CLOUD_PERSIST = "cloud"
const val TABLE_ENCRYPTED = "encrypted"
Expand Down Expand Up @@ -317,7 +317,7 @@ abstract class ExplorerDatabase : RoomDatabase() {
}

internal val MIGRATION_10_11: Migration =
object : Migration(10, DATABASE_VERSION) {
object : Migration(10, 11) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"UPDATE " +
Expand All @@ -331,6 +331,104 @@ abstract class ExplorerDatabase : RoomDatabase() {
}
}

internal val MIGRATION_11_12: Migration =
object : Migration(11, DATABASE_VERSION) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"CREATE TABLE " +
TEMP_TABLE_PREFIX +
TABLE_TAB +
"(" +
COLUMN_TAB_NO +
" INTEGER PRIMARY KEY NOT NULL, " +
COLUMN_PATH +
" TEXT NOT NULL, " +
COLUMN_HOME +
" TEXT NOT NULL)",
)
database.execSQL(
"INSERT INTO " +
TEMP_TABLE_PREFIX +
TABLE_TAB +
"(" +
COLUMN_TAB_NO +
"," +
COLUMN_PATH +
"," +
COLUMN_HOME +
")" +
" SELECT " +
COLUMN_TAB_NO +
"," +
COLUMN_PATH +
"," +
COLUMN_HOME +
" FROM " +
TABLE_TAB,
)
database.execSQL("DROP TABLE $TABLE_TAB")
database.execSQL(
"ALTER TABLE $TEMP_TABLE_PREFIX$TABLE_TAB RENAME TO $TABLE_TAB",
)

database.execSQL(
"CREATE TABLE " +
TEMP_TABLE_PREFIX +
TABLE_ENCRYPTED +
"(" +
COLUMN_ENCRYPTED_ID +
" INTEGER PRIMARY KEY NOT NULL," +
COLUMN_ENCRYPTED_PATH +
" TEXT NOT NULL," +
COLUMN_ENCRYPTED_PASSWORD +
" TEXT NOT NULL)",
)
database.execSQL(
"INSERT INTO " +
TEMP_TABLE_PREFIX +
TABLE_ENCRYPTED +
" SELECT * FROM " +
TABLE_ENCRYPTED,
)
database.execSQL("DROP TABLE $TABLE_ENCRYPTED")
database.execSQL(
"ALTER TABLE " +
TEMP_TABLE_PREFIX +
TABLE_ENCRYPTED +
" RENAME TO " +
TABLE_ENCRYPTED,
)

database.execSQL(
"CREATE TABLE " +
TEMP_TABLE_PREFIX +
TABLE_CLOUD_PERSIST +
"(" +
COLUMN_CLOUD_ID +
" INTEGER PRIMARY KEY NOT NULL," +
COLUMN_CLOUD_SERVICE +
" INTEGER," +
COLUMN_CLOUD_PERSIST +
" TEXT NOT NULL)",
)
database.execSQL(
"INSERT INTO " +
TEMP_TABLE_PREFIX +
TABLE_CLOUD_PERSIST +
" SELECT * FROM " +
TABLE_CLOUD_PERSIST,
)
database.execSQL("DROP TABLE $TABLE_CLOUD_PERSIST")
database.execSQL(
"ALTER TABLE " +
TEMP_TABLE_PREFIX +
TABLE_CLOUD_PERSIST +
" RENAME TO " +
TABLE_CLOUD_PERSIST,
)
}
}

/**
* Initialize the database. Optionally, may provide a custom way to create the database
* with supplied [Context].
Expand All @@ -354,6 +452,7 @@ abstract class ExplorerDatabase : RoomDatabase() {
.addMigrations(MIGRATION_8_9)
.addMigrations(MIGRATION_9_10)
.addMigrations(MIGRATION_10_11)
.addMigrations(MIGRATION_11_12)
.allowMainThreadQueries()
.build()
}
Expand Down
124 changes: 110 additions & 14 deletions app/src/main/java/com/amaze/filemanager/database/UtilitiesDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
companion object {
private val logger = LoggerFactory.getLogger(UtilitiesDatabase::class.java)
private const val DATABASE_NAME = "utilities.db"
const val DATABASE_VERSION = 6
const val DATABASE_VERSION = 7
const val TABLE_HISTORY = "history"
const val TABLE_HIDDEN = "hidden"
const val TABLE_LIST = "list"
Expand All @@ -136,7 +136,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
COLUMN_ID +
" INTEGER PRIMARY KEY," +
COLUMN_PATH +
" TEXT UNIQUE" +
" TEXT UNIQUE NOT NULL" +
");"
)
private const val queryHidden = (
Expand All @@ -146,7 +146,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
COLUMN_ID +
" INTEGER PRIMARY KEY," +
COLUMN_PATH +
" TEXT UNIQUE" +
" TEXT UNIQUE NOT NULL" +
");"
)
private const val queryList = (
Expand All @@ -156,7 +156,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
COLUMN_ID +
" INTEGER PRIMARY KEY," +
COLUMN_PATH +
" TEXT UNIQUE" +
" TEXT UNIQUE NOT NULL" +
");"
)
private const val queryGrid = (
Expand All @@ -166,7 +166,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
COLUMN_ID +
" INTEGER PRIMARY KEY," +
COLUMN_PATH +
" TEXT UNIQUE" +
" TEXT UNIQUE NOT NULL" +
");"
)
private const val queryBookmarks = (
Expand All @@ -176,33 +176,33 @@ abstract class UtilitiesDatabase : RoomDatabase() {
COLUMN_ID +
" INTEGER PRIMARY KEY," +
COLUMN_NAME +
" TEXT," +
" TEXT NOT NULL," +
COLUMN_PATH +
" TEXT UNIQUE" +
" TEXT UNIQUE NOT NULL" +
");"
)
private const val querySmb = (
"CREATE TABLE IF NOT EXISTS " +
TABLE_SMB +
" (" +
COLUMN_ID +
" INTEGER PRIMARY KEY," +
" INTEGER PRIMARY KEY NOT NULL," +
COLUMN_NAME +
" TEXT," +
" TEXT NOT NULL," +
COLUMN_PATH +
" TEXT UNIQUE" +
" TEXT UNIQUE NOT NULL" +
");"
)
private const val querySftp = (
"CREATE TABLE IF NOT EXISTS " +
TABLE_SFTP +
" (" +
COLUMN_ID +
" INTEGER PRIMARY KEY," +
" INTEGER PRIMARY KEY NOT NULL," +
COLUMN_NAME +
" TEXT," +
" TEXT NOT NULL," +
COLUMN_PATH +
" TEXT UNIQUE," +
" TEXT UNIQUE NOT NULL," +
COLUMN_HOST_PUBKEY +
" TEXT," +
COLUMN_PRIVATE_KEY_NAME +
Expand Down Expand Up @@ -481,7 +481,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
}

internal val MIGRATION_5_6: Migration =
object : Migration(5, DATABASE_VERSION) {
object : Migration(5, 6) {
override fun migrate(database: SupportSQLiteDatabase) {
val updateSqls: MutableList<String> = ArrayList()
updateSqls.addAll(migratePasswordInUris(database, TABLE_SMB))
Expand All @@ -492,6 +492,101 @@ abstract class UtilitiesDatabase : RoomDatabase() {
}
}

internal val MIGRATION_6_7: Migration =
object : Migration(6, DATABASE_VERSION) {
override fun migrate(database: SupportSQLiteDatabase) {
var backupTable = TEMP_TABLE_PREFIX + TABLE_BOOKMARKS
database.execSQL(
queryBookmarks
.replace(TABLE_BOOKMARKS, backupTable)
.replace("PRIMARY KEY,", "PRIMARY KEY NOT NULL,"),
)
database.execSQL(
"INSERT INTO " +
backupTable +
"(" +
COLUMN_NAME +
"," +
COLUMN_PATH +
") SELECT DISTINCT(" +
COLUMN_NAME +
"), " +
COLUMN_PATH +
" FROM " +
TABLE_BOOKMARKS,
)
database.execSQL("DROP TABLE $TABLE_BOOKMARKS;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_BOOKMARKS;")
database.execSQL(
"CREATE UNIQUE INDEX 'bookmarks_idx' ON " +
TABLE_BOOKMARKS +
"(" +
COLUMN_NAME +
", " +
COLUMN_PATH +
");",
)
backupTable = TEMP_TABLE_PREFIX + TABLE_GRID
database.execSQL(
queryGrid
.replace(TABLE_GRID, backupTable)
.replace("PRIMARY KEY,", "PRIMARY KEY NOT NULL,"),
)
database.execSQL(
"INSERT INTO $backupTable SELECT * FROM $TABLE_GRID group by path;",
)
database.execSQL("DROP TABLE $TABLE_GRID;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_GRID;")
backupTable = TEMP_TABLE_PREFIX + TABLE_HIDDEN
database.execSQL(
queryHidden
.replace(TABLE_HIDDEN, backupTable)
.replace("PRIMARY KEY,", "PRIMARY KEY NOT NULL,"),
)
database.execSQL(
"INSERT INTO $backupTable SELECT * FROM $TABLE_HIDDEN group by path;",
)
database.execSQL("DROP TABLE $TABLE_HIDDEN;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_HIDDEN;")
backupTable = TEMP_TABLE_PREFIX + TABLE_HISTORY
database.execSQL(
queryHistory
.replace(TABLE_HISTORY, backupTable)
.replace("PRIMARY KEY,", "PRIMARY KEY NOT NULL,"),
)
database.execSQL(
"INSERT INTO $backupTable SELECT * FROM $TABLE_HISTORY group by path;",
)
database.execSQL("DROP TABLE $TABLE_HISTORY;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_HISTORY;")
backupTable = TEMP_TABLE_PREFIX + TABLE_LIST
database.execSQL(
queryList
.replace(TABLE_LIST, backupTable)
.replace("PRIMARY KEY,", "PRIMARY KEY NOT NULL,"),
)
database.execSQL(
"INSERT INTO $backupTable SELECT * FROM $TABLE_LIST group by path;",
)
database.execSQL("DROP TABLE $TABLE_LIST;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_LIST;")
backupTable = TEMP_TABLE_PREFIX + TABLE_SMB
database.execSQL(querySmb.replace(TABLE_SMB, backupTable))
database.execSQL(
"INSERT INTO $backupTable SELECT * FROM $TABLE_SMB group by path;",
)
database.execSQL("DROP TABLE $TABLE_SMB;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_SMB;")
backupTable = TEMP_TABLE_PREFIX + TABLE_SFTP
database.execSQL(querySftp.replace(TABLE_SFTP, backupTable))
database.execSQL(
"INSERT INTO $backupTable SELECT * FROM $TABLE_SFTP group by path;",
)
database.execSQL("DROP TABLE $TABLE_SFTP;")
database.execSQL("ALTER TABLE $backupTable RENAME TO $TABLE_SFTP;")
}
}

/**
* Initialize the database. Optionally, may provide a custom way to create the database
* with supplied [Context].
Expand All @@ -512,6 +607,7 @@ abstract class UtilitiesDatabase : RoomDatabase() {
MIGRATION_3_4,
MIGRATION_4_5,
MIGRATION_5_6,
MIGRATION_6_7,
)
.build()
}
Expand Down
Loading
Loading