mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Mark unexpected cancellation when silenced so we do not keep hammering the logs.

main
Alex Hart 2022-11-04 09:41:30 -03:00 zatwierdzone przez Cody Henthorne
rodzic b8e16353ab
commit f6f1fdb87d
3 zmienionych plików z 5 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationFragment.kt
Wyświetl plik

@ -58,7 +58,7 @@ class DonorErrorConfigurationFragment : DSLSettingsFragment() {
secondaryButtonNoOutline( secondaryButtonNoOutline(
text = DSLSettingsText.from(R.string.preferences__internal_donor_error_clear), text = DSLSettingsText.from(R.string.preferences__internal_donor_error_clear),
onClick = { onClick = {
lifecycleDisposable += viewModel.clear().subscribe() lifecycleDisposable += viewModel.clearErrorState().subscribe()
} }
) )
} }

4
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationViewModel.kt
Wyświetl plik

@ -108,10 +108,10 @@ class DonorErrorConfigurationViewModel : ViewModel() {
} }
}.subscribeOn(Schedulers.io()) }.subscribeOn(Schedulers.io())
return clear().andThen(saveState) return clearErrorState().andThen(saveState)
} }
fun clear(): Completable { fun clearErrorState(): Completable {
return Completable.fromAction { return Completable.fromAction {
synchronized(SubscriptionReceiptRequestResponseJob.MUTEX) { synchronized(SubscriptionReceiptRequestResponseJob.MUTEX) {
SignalStore.donationsValues().setExpiredBadge(null) SignalStore.donationsValues().setExpiredBadge(null)

2
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
Wyświetl plik

@ -408,8 +408,10 @@ public class ConversationListFragment extends MainFragment implements ActionMode
isDisplayingSubscriptionFailure = true; isDisplayingSubscriptionFailure = true;
} else if (unexpectedSubscriptionCancellation != null && SignalStore.donationsValues().isUserManuallyCancelled()) { } else if (unexpectedSubscriptionCancellation != null && SignalStore.donationsValues().isUserManuallyCancelled()) {
Log.w(TAG, "Unexpected cancellation detected but not displaying dialog because user manually cancelled their subscription: " + unexpectedSubscriptionCancellation, true); Log.w(TAG, "Unexpected cancellation detected but not displaying dialog because user manually cancelled their subscription: " + unexpectedSubscriptionCancellation, true);
SignalStore.donationsValues().setUnexpectedSubscriptionCancelationWatermark(subscriptionFailureTimestamp);
} else if (unexpectedSubscriptionCancellation != null && !SignalStore.donationsValues().showCantProcessDialog()) { } else if (unexpectedSubscriptionCancellation != null && !SignalStore.donationsValues().showCantProcessDialog()) {
Log.w(TAG, "Unexpected cancellation detected but not displaying dialog because user has silenced it.", true); Log.w(TAG, "Unexpected cancellation detected but not displaying dialog because user has silenced it.", true);
SignalStore.donationsValues().setUnexpectedSubscriptionCancelationWatermark(subscriptionFailureTimestamp);
} }
if (expiredBadge != null && !isDisplayingSubscriptionFailure) { if (expiredBadge != null && !isDisplayingSubscriptionFailure) {