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

Support member labels access control in backups.

Browse Source
This commit is contained in:
jeffrey-signal
2026-03-06 19:19:36 -05:00
parent 9500f4a59c
commit 2b9bb3fb5c
229 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,12 @@ private fun AccessControl.AccessRequired.toRemote(): Group.AccessControl.AccessR
}
private fun AccessControl.toRemote(): Group.AccessControl {
return Group.AccessControl(members = members.toRemote(), attributes = attributes.toRemote(), addFromInviteLink = addFromInviteLink.toRemote())
return Group.AccessControl(
members = members.toRemote(),
attributes = attributes.toRemote(),
addFromInviteLink = addFromInviteLink.toRemote(),
memberLabel = memberLabel.toRemote()
)
}
private fun Member.Role.toRemote(): Group.Member.Role {

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

@@ -104,7 +104,12 @@ private fun Group.AccessControl.AccessRequired.toLocal(): AccessControl.AccessRe
}
private fun Group.AccessControl.toLocal(): AccessControl {
return AccessControl(members = this.members.toLocal(), attributes = this.attributes.toLocal(), addFromInviteLink = this.addFromInviteLink.toLocal())
return AccessControl(
members = this.members.toLocal(),
attributes = this.attributes.toLocal(),
addFromInviteLink = this.addFromInviteLink.toLocal(),
memberLabel = this.memberLabel.toLocal()
)
}
private fun Group.Member.Role.toLocal(): Member.Role {