Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support member labels in backups.

Browse Source
This commit is contained in:
jeffrey-signal
2026-02-11 18:06:18 -05:00
committed by Michelle Tang
parent 28d8d62cbd
commit 59bb505a3e
17 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
View File

@@ -123,7 +123,13 @@ private fun Member.Role.toRemote(): Group.Member.Role {
}
private fun DecryptedMember.toRemote(): Group.Member {
return Group.Member(userId = aciBytes, role = role.toRemote(), joinedAtVersion = joinedAtRevision)
return Group.Member(
userId = aciBytes,
role = role.toRemote(),
joinedAtVersion = joinedAtRevision,
labelEmoji = labelEmoji,
labelString = labelString
)
}
private fun DecryptedPendingMember.toRemote(): Group.MemberPendingProfileKey {

8
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
View File

@@ -116,7 +116,13 @@ private fun Group.Member.Role.toLocal(): Member.Role {
}
private fun Group.Member.toLocal(): DecryptedMember {
return DecryptedMember(aciBytes = userId, role = role.toLocal(), joinedAtRevision = joinedAtVersion)
return DecryptedMember(
aciBytes = userId,
role = role.toLocal(),
joinedAtRevision = joinedAtVersion,
labelEmoji = labelEmoji,
labelString = labelString
)
}
private fun Group.MemberPendingAdminApproval.toLocal(): DecryptedRequestingMember {