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

Remove unnecessary subscriber call for manual cancel.

Browse source
This commit is contained in:
Alex Hart 2024-06-03 13:30:50 -03:00 • committed by Cody Henthorne
parent 6dcb2e8d24
commit 30b339a482
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsRepository.kt
View file

@ -298,8 +298,7 @@ object InAppPaymentsRepository {
@JvmStatic
@WorkerThread
fun isUserManuallyCancelled(subscriberType: InAppPaymentSubscriberRecord.Type): Boolean {
val subscriber = getSubscriber(subscriberType) ?: return false
val latestSubscription = SignalDatabase.inAppPayments.getLatestInAppPaymentByType(subscriber.type.inAppPaymentType)
val latestSubscription = SignalDatabase.inAppPayments.getLatestInAppPaymentByType(subscriberType.inAppPaymentType)
return if (latestSubscription == null) {
SignalStore.donationsValues().isUserManuallyCancelled()

26
app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
View file

@ -478,20 +478,22 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
@WorkerThread
fun updateLocalStateForLocalSubscribe(subscriberType: InAppPaymentSubscriberRecord.Type) {
synchronized(subscriberType) {
Log.d(TAG, "[updateLocalStateForLocalSubscribe] Clearing donation values.")
if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
Log.d(TAG, "[updateLocalStateForLocalSubscribe] Clearing donation values.")
clearUserManuallyCancelled()
clearLevelOperations()
setUnexpectedSubscriptionCancelationChargeFailure(null)
unexpectedSubscriptionCancelationReason = null
unexpectedSubscriptionCancelationTimestamp = 0L
refreshSubscriptionRequestCredential()
clearSubscriptionReceiptCredential()
clearUserManuallyCancelled()
clearLevelOperations()
setUnexpectedSubscriptionCancelationChargeFailure(null)
unexpectedSubscriptionCancelationReason = null
unexpectedSubscriptionCancelationTimestamp = 0L
refreshSubscriptionRequestCredential()
clearSubscriptionReceiptCredential()
val expiredBadge = getExpiredBadge()
if (expiredBadge != null && expiredBadge.isSubscription()) {
Log.d(TAG, "[updateLocalStateForLocalSubscribe] Clearing expired badge.")
setExpiredBadge(null)
val expiredBadge = getExpiredBadge()
if (expiredBadge != null && expiredBadge.isSubscription()) {
Log.d(TAG, "[updateLocalStateForLocalSubscribe] Clearing expired badge.")
setExpiredBadge(null)
}
}
val subscriber = InAppPaymentsRepository.requireSubscriber(subscriberType)