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

Don't remove self profile key during restore.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-07-30 12:33:46 -04:00
committed by Alex Hart
parent 607115b49e
commit 517a4bc4e6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
+7 -5
View File
@@ -13,9 +13,9 @@ import org.signal.core.util.logging.Log
import org.signal.core.util.nullIfBlank
import org.signal.core.util.select
import org.signal.core.util.update
import org.signal.libsignal.zkgroup.InvalidInputException
import org.thoughtcrime.securesms.backup.v2.exporters.ContactArchiveExporter
import org.thoughtcrime.securesms.backup.v2.exporters.GroupArchiveExporter
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
import org.thoughtcrime.securesms.database.GroupTable
import org.thoughtcrime.securesms.database.IdentityTable
import org.thoughtcrime.securesms.database.RecipientTable
@@ -131,10 +131,12 @@ fun RecipientTable.restoreSelfFromBackup(accountData: AccountData, selfId: Recip
put(RecipientTable.UNREGISTERED_TIMESTAMP, 0)
put(RecipientTable.EXTRAS, RecipientExtras().encode())
try {
put(RecipientTable.PROFILE_KEY, Base64.encodeWithPadding(accountData.profileKey.toByteArray()).nullIfBlank())
} catch (e: InvalidInputException) {
Log.w(TAG, "Missing profile key during restore")
val profileKey = ProfileKeyUtil.profileKeyOrNull(accountData.profileKey.toByteArray())
if (profileKey != null) {
put(RecipientTable.PROFILE_KEY, Base64.encodeWithPadding(profileKey.serialize()))
} else {
// Don't clear the key we already have. A null profile key for self is fatal in a bunch of places (profile uploads, outgoing messages, etc).
Log.w(TAG, "Missing profile key during restore! Keeping the existing one.")
}
put(RecipientTable.USERNAME, accountData.username)