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

Implement pending one-time donation error handling.

Browse Source
This commit is contained in:
Alex Hart
2023-10-23 12:50:54 -04:00
committed by GitHub
parent d497ed4195
commit 10eec025d2
19 changed files with 615 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
View File

@@ -160,9 +160,13 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
private var _pendingOneTimeDonation: PendingOneTimeDonation? by protoValue(PENDING_ONE_TIME_DONATION, PendingOneTimeDonation.ADAPTER)
private val pendingOneTimeDonationPublisher: Subject<Optional<PendingOneTimeDonation>> by lazy { BehaviorSubject.createDefault(Optional.ofNullable(_pendingOneTimeDonation)) }
/**
* Returns a stream of PendingOneTimeDonation, filtering out expired donations that do not have an error attached to them.
*/
val observablePendingOneTimeDonation: Observable<Optional<PendingOneTimeDonation>> by lazy {
pendingOneTimeDonationPublisher.map { optionalPendingOneTimeDonation ->
optionalPendingOneTimeDonation.filter { !it.isExpired }
optionalPendingOneTimeDonation.filter { (it.error != null) || !it.isExpired }
}
}
@@ -534,11 +538,28 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
}
}
fun getPendingOneTimeDonation(): PendingOneTimeDonation? = _pendingOneTimeDonation.takeUnless { it?.isExpired == true }
fun getPendingOneTimeDonation(): PendingOneTimeDonation? {
return synchronized(this) {
_pendingOneTimeDonation.takeUnless { it?.isExpired == true }
}
}
fun setPendingOneTimeDonation(pendingOneTimeDonation: PendingOneTimeDonation?) {
this._pendingOneTimeDonation = pendingOneTimeDonation
pendingOneTimeDonationPublisher.onNext(Optional.ofNullable(pendingOneTimeDonation))
synchronized(this) {
this._pendingOneTimeDonation = pendingOneTimeDonation
pendingOneTimeDonationPublisher.onNext(Optional.ofNullable(pendingOneTimeDonation))
}
}
fun setPendingOneTimeDonationError(error: PendingOneTimeDonation.Error) {
synchronized(this) {
val pendingOneTimeDonation = getPendingOneTimeDonation()
if (pendingOneTimeDonation != null) {
setPendingOneTimeDonation(pendingOneTimeDonation.newBuilder().error(error).build())
} else {
Log.w(TAG, "PendingOneTimeDonation was null, ignoring error.")
}
}
}
fun consumePending3DSData(uiSessionKey: Long): Stripe3DSData? {