2FAS/2fas-android
1
0
Fork 0
mirror of https://github.com/twofas/2fas-android.git synced 2024-11-21 17:59:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump backup schema

Browse Source
This commit is contained in:
Rafał Kobyłko 2023-11-11 16:07:07 +01:00
parent 0d5b902ba8
commit e97f1a1040
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/cloud/src/main/java/com/twofasapp/data/cloud/googledrive/GoogleDriveImpl.kt
View File

@ -31,6 +31,7 @@ internal class GoogleDriveImpl(
companion object { companion object {
private val backupVersions = listOf( private val backupVersions = listOf(
"2fas-backup-v4.json",
"2fas-backup-v3.json", "2fas-backup-v3.json",
"2fas-backup-v2.json", "2fas-backup-v2.json",
"2fas-backup.json" "2fas-backup.json"
@ -46,10 +47,11 @@ internal class GoogleDriveImpl(
?: return@withContext GoogleDriveFileResult.Failure(error = GoogleDriveError.CredentialsNotFound) ?: return@withContext GoogleDriveFileResult.Failure(error = GoogleDriveError.CredentialsNotFound)
val drive = getDrive(credentials) val drive = getDrive(credentials)
val backupFileId = getFiles(drive) val backupFile = getFiles(drive)
?.filter { backupVersions.contains(it.name) } ?.filter { backupVersions.contains(it.name) }
?.firstOrNull() ?.firstOrNull()
?.id
val backupFileId = backupFile?.id
if (backupFileId != null) { if (backupFileId != null) {
val fileContent = drive.files()[backupFileId]?.executeMediaAsInputStream()?.use { inputStream -> val fileContent = drive.files()[backupFileId]?.executeMediaAsInputStream()?.use { inputStream ->
@ -57,6 +59,7 @@ internal class GoogleDriveImpl(
reader.readText() reader.readText()
} }
} }
Timber.d("GetFile <- ${backupFile.name}")
Timber.d("GetFile <- \"$fileContent\"") Timber.d("GetFile <- \"$fileContent\"")
Timber.d("GetFile <- Success") Timber.d("GetFile <- Success")

2
data/services/src/main/java/com/twofasapp/data/services/domain/BackupContent.kt
View File

@ -27,7 +27,7 @@ data class BackupContent(
val reference: String? = null, val reference: String? = null,
) { ) {
companion object { companion object {
const val CurrentSchema = 3 const val CurrentSchema = 4
const val Reference = const val Reference =
"tRViSsLKzd86Hprh4ceC2OP7xazn4rrt4xhfEUbOjxLX8Rc3mkISXE0lWbmnWfggogbBJhtYgpK6fMl1D6mtsy92R3HkdGfwuXbzLebqVFJsR7IZ2w58t938iymwG4824igYy1wi6n2WDpO1Q1P69zwJGs2F5a1qP4MyIiDSD7NCV2OvidXQCBnDlGfmz0f1BQySRkkt4ryiJeCjD2o4QsveJ9uDBUn8ELyOrESv5R5DMDkD4iAF8TXU7KyoJujd" "tRViSsLKzd86Hprh4ceC2OP7xazn4rrt4xhfEUbOjxLX8Rc3mkISXE0lWbmnWfggogbBJhtYgpK6fMl1D6mtsy92R3HkdGfwuXbzLebqVFJsR7IZ2w58t938iymwG4824igYy1wi6n2WDpO1Q1P69zwJGs2F5a1qP4MyIiDSD7NCV2OvidXQCBnDlGfmz0f1BQySRkkt4ryiJeCjD2o4QsveJ9uDBUn8ELyOrESv5R5DMDkD4iAF8TXU7KyoJujd"

4
prefs/src/main/java/com/twofasapp/prefs/model/RemoteBackup.kt
View File

@ -27,8 +27,6 @@ data class RemoteBackup(
val reference: String? = null, val reference: String? = null,
) { ) {
companion object { companion object {
const val CURRENT_SCHEMA = 3 const val CURRENT_SCHEMA = 4
fun createEmpty() = RemoteBackup()
} }
} }