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

Move FiatMoney object to core-util module.

Browse Source
This commit is contained in:
Alex Hart
2021-09-30 11:44:18 -03:00
committed by Greyson Parrelli
parent 0fa13eb097
commit 7752b3aba3
12 changed files with 128 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/payments/FiatMoneyUtil.java
View File

@@ -9,7 +9,7 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.thoughtcrime.securesms.util.DateUtils;
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
import org.whispersystems.libsignal.util.guava.Optional;

2
app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentState.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.payments.Payee;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.whispersystems.signalservice.api.payments.Money;
import java.util.UUID;

2
app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentViewModel.java
View File

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.payments.FiatMoneyUtil;
import org.thoughtcrime.securesms.payments.PaymentTransactionLiveData;
import org.thoughtcrime.securesms.payments.PaymentsAddressException;
import org.thoughtcrime.securesms.payments.confirm.ConfirmPaymentRepository.ConfirmPaymentResult;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.thoughtcrime.securesms.util.DefaultValueLiveData;
import org.thoughtcrime.securesms.util.SingleLiveEvent;
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;

2
app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentViewModel.java
View File

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.payments.Balance;
import org.thoughtcrime.securesms.payments.CreatePaymentDetails;
import org.thoughtcrime.securesms.payments.FiatMoneyUtil;
import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.thoughtcrime.securesms.payments.preferences.model.PayeeParcelable;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.DefaultValueLiveData;

2
app/src/main/java/org/thoughtcrime/securesms/payments/create/InputState.java
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.payments.create;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.payments.Money;

1
app/src/main/java/org/thoughtcrime/securesms/payments/currency/CurrencyExchange.java
View File

@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import org.signal.core.util.money.FiatMoney;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.payments.Money;

34
app/src/main/java/org/thoughtcrime/securesms/payments/currency/FiatMoney.java
View File

@@ -1,34 +0,0 @@
package org.thoughtcrime.securesms.payments.currency;
import androidx.annotation.NonNull;
import java.math.BigDecimal;
import java.util.Currency;
public class FiatMoney {
private final BigDecimal amount;
private final Currency currency;
private final long timestamp;
public FiatMoney(@NonNull BigDecimal amount, @NonNull Currency currency) {
this(amount, currency, 0);
}
public FiatMoney(@NonNull BigDecimal amount, @NonNull Currency currency, long timestamp) {
this.amount = amount;
this.currency = currency;
this.timestamp = timestamp;
}
public @NonNull BigDecimal getAmount() {
return amount;
}
public @NonNull Currency getCurrency() {
return currency;
}
public long getTimestamp() {
return timestamp;
}
}

2
app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeState.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.thoughtcrime.securesms.payments.preferences.model.PaymentItem;
import java.util.Collections;

2
app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeViewModel.java
View File

@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.payments.Payment;
import org.thoughtcrime.securesms.payments.UnreadPaymentsRepository;
import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
import org.thoughtcrime.securesms.payments.currency.CurrencyExchangeRepository;
import org.thoughtcrime.securesms.payments.currency.FiatMoney;
import org.signal.core.util.money.FiatMoney;
import org.thoughtcrime.securesms.payments.preferences.model.InProgress;
import org.thoughtcrime.securesms.payments.preferences.model.InfoCard;
import org.thoughtcrime.securesms.payments.preferences.model.IntroducingPayments;