2FAS/2fas-android
1
0
Fork 0
mirror of https://github.com/twofas/2fas-android.git synced 2024-11-22 02:09:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid groups order when connected to backup

Browse Source
This commit is contained in:
Rafał Kobyłko 2023-11-11 13:14:33 +01:00
parent a0b3959aae
commit 54bf4205eb
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
data/services/src/main/java/com/twofasapp/data/services/local/GroupsLocalSource.kt
View File

@ -1,10 +1,10 @@
package com.twofasapp.data.services.local
import com.twofasapp.common.domain.BackupSyncStatus
import com.twofasapp.common.time.TimeProvider
import com.twofasapp.data.services.domain.Group
import com.twofasapp.data.services.local.model.GroupEntity
import com.twofasapp.data.services.local.model.GroupsEntity
import com.twofasapp.common.domain.BackupSyncStatus
import com.twofasapp.storage.PlainPreferences
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
@ -147,7 +147,23 @@ internal class GroupsLocalSource(
if (index > 0) {
Collections.swap(local.list, index, index - 1)
}
preferences.putString(KeyGroups, json.encodeToString(local))
preferences.putString(
KeyGroups,
json.encodeToString(
local.copy(
list = local.list.map { groupEntity ->
if (groupEntity.id == id) {
groupEntity.copy(
updatedAt = timeProvider.systemCurrentTime(),
backupSyncStatus = BackupSyncStatus.NOT_SYNCED,
)
} else {
groupEntity
}
}
)
)
)
}
fun moveDownGroup(id: String) {
@ -157,7 +173,24 @@ internal class GroupsLocalSource(
if (index < local.list.size - 1) {
Collections.swap(local.list, index, index + 1)
}
preferences.putString(KeyGroups, json.encodeToString(local))
preferences.putString(
KeyGroups,
json.encodeToString(
local.copy(
list = local.list.map { groupEntity ->
if (groupEntity.id == id) {
groupEntity.copy(
updatedAt = timeProvider.systemCurrentTime(),
backupSyncStatus = BackupSyncStatus.NOT_SYNCED,
)
} else {
groupEntity
}
}
)
)
)
}
fun toggleGroup(id: String?) {