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

Fix incorrect display of ISK recurring cost.

Browse source
This commit is contained in:
Alex Hart 2024-09-20 16:11:47 -03:00
parent cafa5c9e28
commit 7935d12675
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
View file

@ -410,10 +410,7 @@ class DonateToSignalFragment :
val isActive = state.activeLevel == subscription.level && state.isSubscriptionActive
val activePrice = state.activeSubscription?.let { sub ->
val activeCurrency = Currency.getInstance(sub.currency)
val activeAmount = sub.amount.movePointLeft(activeCurrency.defaultFractionDigits)
FiatMoney(activeAmount, activeCurrency)
FiatMoney.fromSignalNetworkAmount(sub.amount, Currency.getInstance(sub.currency))
}
customPref(

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
View file

@ -265,12 +265,9 @@ class ManageDonationsFragment :
state: ManageDonationsState
) {
presentSubscriptionSettingsWithState(state) {
val activeCurrency = Currency.getInstance(activeSubscription.currency)
val activeAmount = activeSubscription.amount.movePointLeft(activeCurrency.defaultFractionDigits)
customPref(
ActiveSubscriptionPreference.Model(
price = FiatMoney(activeAmount, activeCurrency),
price = FiatMoney.fromSignalNetworkAmount(activeSubscription.amount, Currency.getInstance(activeSubscription.currency)),
subscription = subscription,
renewalTimestamp = TimeUnit.SECONDS.toMillis(activeSubscription.endOfCurrentPeriod),
redemptionState = state.getMonthlyDonorRedemptionState(),

12
core-util/src/main/java/org/signal/core/util/money/FiatMoney.java
View file

@ -77,6 +77,18 @@ public class FiatMoney {
return formatter.format(amount.multiply(multiplicand));
}
/**
* Transforms the given currency / amount pair from a signal network amount to a FiatMoney, accounting for the special
* cased multiplicands for ISK and UGX
*/
public static @NonNull FiatMoney fromSignalNetworkAmount(@NonNull BigDecimal amount, @NonNull Currency currency) {
String currencyCode = currency.getCurrencyCode();
int shift = SPECIAL_CASE_MULTIPLICANDS.contains(currencyCode) ? 2: currency.getDefaultFractionDigits();
BigDecimal shiftedAmount = amount.movePointLeft(shift);
return new FiatMoney(shiftedAmount, currency);
}
public static boolean equals(FiatMoney left, FiatMoney right) {
return Objects.equals(left.amount, right.amount) &&
Objects.equals(left.currency, right.currency) &&