Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-25 05:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to the latest backup.proto

Browse Source
This commit is contained in:
Greyson Parrelli
2025-02-25 16:26:50 -05:00
parent e9106ba951
commit b6038f8ae3
10 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto
View File

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto
View File

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto
View File

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto
View File

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto
View File

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto Normal file
View File

Binary file not shown.

3
app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
View File

@@ -46,6 +46,9 @@ fun RecipientTable.getContactsForBackup(selfId: Long): ContactArchiveExporter {
"${RecipientTable.TABLE_NAME}.${RecipientTable.PROFILE_GIVEN_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.PROFILE_FAMILY_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.PROFILE_JOINED_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.SYSTEM_GIVEN_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.SYSTEM_FAMILY_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.SYSTEM_NICKNAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.NICKNAME_GIVEN_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.NICKNAME_FAMILY_NAME}",
"${RecipientTable.TABLE_NAME}.${RecipientTable.NOTE}",

3
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
View File

@@ -78,6 +78,9 @@ class ContactArchiveExporter(private val cursor: Cursor, private val selfId: Lon
.identityState(cursor.optionalInt(IdentityTable.VERIFIED).map { IdentityTable.VerifiedStatus.forState(it) }.orElse(IdentityTable.VerifiedStatus.DEFAULT).toRemote())
.note(cursor.requireString(RecipientTable.NOTE) ?: "")
.nickname(cursor.readNickname())
.systemGivenName(cursor.requireString(RecipientTable.SYSTEM_GIVEN_NAME) ?: "")
.systemFamilyName(cursor.requireString(RecipientTable.SYSTEM_FAMILY_NAME) ?: "")
.systemNickname(cursor.requireString(RecipientTable.SYSTEM_NICKNAME) ?: "")
val registeredState = RecipientTable.RegisteredState.fromId(cursor.requireInt(RecipientTable.REGISTERED))
if (registeredState == RecipientTable.RegisteredState.REGISTERED) {

5
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ContactArchiveImporter.kt
View File

@@ -52,7 +52,10 @@ object ContactArchiveImporter {
RecipientTable.EXTRAS to contact.toLocalExtras().encode(),
RecipientTable.NOTE to contact.note,
RecipientTable.NICKNAME_GIVEN_NAME to contact.nickname?.given,
RecipientTable.NICKNAME_FAMILY_NAME to contact.nickname?.family
RecipientTable.NICKNAME_FAMILY_NAME to contact.nickname?.family,
RecipientTable.SYSTEM_GIVEN_NAME to contact.systemGivenName,
RecipientTable.SYSTEM_FAMILY_NAME to contact.systemFamilyName,
RecipientTable.SYSTEM_NICKNAME to contact.systemNickname
)
if (contact.registered != null) {

3
app/src/main/protowire/Backup.proto
View File

@@ -177,6 +177,9 @@ message Contact {
IdentityState identityState = 15;
Name nickname = 16; // absent iff both `given` and `family` are empty
string note = 17;
string systemGivenName = 18;
string systemFamilyName = 19;
string systemNickname = 20;
}
message Group {