empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Potential fix for a backup validation error.

Browse source
This commit is contained in:
Greyson Parrelli 2024-11-21 13:55:12 -05:00
parent 91b411abb5
commit 767261152a
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
View file

@ -78,7 +78,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreview
import org.thoughtcrime.securesms.mms.QuoteModel import org.thoughtcrime.securesms.mms.QuoteModel
import org.thoughtcrime.securesms.payments.FailureReason import org.thoughtcrime.securesms.payments.FailureReason
import org.thoughtcrime.securesms.payments.State import org.thoughtcrime.securesms.payments.State
import org.thoughtcrime.securesms.payments.proto.PaymentMetaData
import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.JsonUtils import org.thoughtcrime.securesms.util.JsonUtils
import org.whispersystems.signalservice.api.push.ServiceId.ACI import org.whispersystems.signalservice.api.push.ServiceId.ACI
@ -882,20 +881,18 @@ private fun PaymentTable.PaymentTransaction.toRemoteTransactionDetails(): Paymen
timestamp = this.timestamp, timestamp = this.timestamp,
blockIndex = this.blockIndex, blockIndex = this.blockIndex,
blockTimestamp = this.blockTimestamp, blockTimestamp = this.blockTimestamp,
mobileCoinIdentification = this.paymentMetaData.mobileCoinTxoIdentification?.toRemote(), mobileCoinIdentification = this.paymentMetaData.mobileCoinTxoIdentification?.let {
PaymentNotification.TransactionDetails.MobileCoinTxoIdentification(
publicKey = it.publicKey.takeIf { this.direction.isReceived } ?: emptyList(),
keyImages = it.keyImages.takeIf { this.direction.isSent } ?: emptyList()
)
},
transaction = this.transaction?.toByteString(), transaction = this.transaction?.toByteString(),
receipt = this.receipt?.toByteString() receipt = this.receipt?.toByteString()
) )
) )
} }
private fun PaymentMetaData.MobileCoinTxoIdentification.toRemote(): PaymentNotification.TransactionDetails.MobileCoinTxoIdentification {
return PaymentNotification.TransactionDetails.MobileCoinTxoIdentification(
publicKey = this.publicKey,
keyImages = this.keyImages
)
}
private fun State.toRemote(): PaymentNotification.TransactionDetails.Transaction.Status { private fun State.toRemote(): PaymentNotification.TransactionDetails.Transaction.Status {
return when (this) { return when (this) {
State.INITIAL -> PaymentNotification.TransactionDetails.Transaction.Status.INITIAL State.INITIAL -> PaymentNotification.TransactionDetails.Transaction.Status.INITIAL