hardcoresushi/DroidFS
2
2
Fork 3
Code Issues 12 Pull Requests 1 Releases 24 Activity

Really fix database upgrade

Browse Source
This commit is contained in:
Matéo Duparc 2023-09-19 11:41:01 +02:00
parent 891a581329
commit 571a79cc1d
Signed by: hardcoresushi
GPG Key ID: AFE384344A45E13A
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -37,8 +37,8 @@ android {
applicationId "sushi.hardcore.droidfs" applicationId "sushi.hardcore.droidfs"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 32 targetSdkVersion 32
versionCode 34 versionCode 35
versionName "2.1.1" versionName "2.1.2"
ndk { ndk {
abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a" abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"

9
app/src/main/java/sushi/hardcore/droidfs/VolumeDatabase.kt
View File

@ -9,7 +9,6 @@ import android.util.Log
import sushi.hardcore.droidfs.filesystems.EncryptedVolume import sushi.hardcore.droidfs.filesystems.EncryptedVolume
import sushi.hardcore.droidfs.util.PathUtils import sushi.hardcore.droidfs.util.PathUtils
import java.io.File import java.io.File
import java.util.UUID
class VolumeDatabase(private val context: Context): SQLiteOpenHelper(context, Constants.VOLUME_DATABASE_NAME, null, 6) { class VolumeDatabase(private val context: Context): SQLiteOpenHelper(context, Constants.VOLUME_DATABASE_NAME, null, 6) {
companion object { companion object {
@ -102,6 +101,10 @@ class VolumeDatabase(private val context: Context): SQLiteOpenHelper(context, Co
volumeNames[i++] = cursor.getString(0) volumeNames[i++] = cursor.getString(0)
} }
cursor.close() cursor.close()
if (volumeNames.isEmpty()) {
db.execSQL("DROP TABLE $TABLE_NAME;")
createTable(db)
} else {
db.execSQL("ALTER TABLE $TABLE_NAME RENAME TO OLD;") db.execSQL("ALTER TABLE $TABLE_NAME RENAME TO OLD;")
createTable(db) createTable(db)
val uuidsValues = volumeNames.indices.joinToString(", ") { "('${VolumeData.newUuid()}', ?)" } val uuidsValues = volumeNames.indices.joinToString(", ") { "('${VolumeData.newUuid()}', ?)" }
@ -109,12 +112,14 @@ class VolumeDatabase(private val context: Context): SQLiteOpenHelper(context, Co
db.execSQL( db.execSQL(
"INSERT INTO $TABLE_NAME " + "INSERT INTO $TABLE_NAME " +
"WITH uuids($COLUMN_UUID, $COLUMN_NAME) AS (VALUES $uuidsValues) " + "WITH uuids($COLUMN_UUID, $COLUMN_NAME) AS (VALUES $uuidsValues) " +
"SELECT * FROM OLD NATURAL JOIN uuids;", "SELECT $COLUMN_UUID, OLD.$COLUMN_NAME, $COLUMN_HIDDEN, $COLUMN_TYPE, $COLUMN_HASH, $COLUMN_IV " +
"FROM OLD JOIN uuids ON OLD.name = uuids.name;",
volumeNames volumeNames
) )
db.execSQL("DROP TABLE OLD;") db.execSQL("DROP TABLE OLD;")
} }
} }
}
private fun extractVolumeData(cursor: Cursor): VolumeData { private fun extractVolumeData(cursor: Cursor): VolumeData {
return VolumeData( return VolumeData(

1
fastlane/metadata/android/en-US/changelogs/35.txt Normal file
View File

@ -0,0 +1 @@
- Really fix database upgrade crash