filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing mapper for incoming key forward trail

Browse Source
This commit is contained in:
Valere 2022-04-26 14:46:52 +02:00
parent 012dfeb715
commit 728faaee19
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/AuditTrailMapper.kt
View File

@ -30,7 +30,7 @@ internal object AuditTrailMapper {
fun map(entity: AuditTrailEntity): AuditTrail? { fun map(entity: AuditTrailEntity): AuditTrail? {
val contentJson = entity.contentJson ?: return null val contentJson = entity.contentJson ?: return null
return when (entity.type) { return when (entity.type) {
TrailType.OutgoingKeyForward.name -> { TrailType.OutgoingKeyForward.name -> {
val info = tryOrNull { val info = tryOrNull {
MoshiProvider.providesMoshi().adapter(ForwardInfo::class.java).fromJson(contentJson) MoshiProvider.providesMoshi().adapter(ForwardInfo::class.java).fromJson(contentJson)
} ?: return null } ?: return null
@ -60,7 +60,17 @@ internal object AuditTrailMapper {
info = info info = info
) )
} }
else -> { TrailType.IncomingKeyForward.name -> {
val info = tryOrNull {
MoshiProvider.providesMoshi().adapter(ForwardInfo::class.java).fromJson(contentJson)
} ?: return null
AuditTrail(
ageLocalTs = entity.ageLocalTs ?: 0,
type = TrailType.IncomingKeyForward,
info = info
)
}
else -> {
AuditTrail( AuditTrail(
ageLocalTs = entity.ageLocalTs ?: 0, ageLocalTs = entity.ageLocalTs ?: 0,
type = TrailType.Unknown, type = TrailType.Unknown,