Merge pull request #4731 from ghubstan/19-sqrrm-pr-changes

Resolve issues found in reviewed PRs 4699, 4703, 4711 [, ...]

cli/src/main/java/bisq/cli/TableFormat.java

@@ -63,7 +63,7 @@ static String formatAddressBalanceTbl(List<AddressBalanceInfo> addressBalanceInf
 
     static String formatOfferTable(List<OfferInfo> offerInfo, String fiatCurrency) {
 
-        // Some column values might be longer than header, so we need to calculated them.
+        // Some column values might be longer than header, so we need to calculate them.
         int paymentMethodColWidth = getLengthOfLongestColumn(
                 COL_HEADER_PAYMENT_METHOD.length(),
                 offerInfo.stream()
@@ -100,7 +100,7 @@ static String formatOfferTable(List<OfferInfo> offerInfo, String fiatCurrency) {
     }
 
     static String formatPaymentAcctTbl(List<PaymentAccount> paymentAccounts) {
-        // Some column values might be longer than header, so we need to calculated them.
+        // Some column values might be longer than header, so we need to calculate them.
         int nameColWidth = getLengthOfLongestColumn(
                 COL_HEADER_NAME.length(),
                 paymentAccounts.stream().map(PaymentAccount::getAccountName)

cli/src/main/java/bisq/cli/TradeFormat.java

@@ -33,7 +33,7 @@ public class TradeFormat {
 
     @VisibleForTesting
     public static String format(TradeInfo tradeInfo) {
-        // Some column values might be longer than header, so we need to calculated them.
+        // Some column values might be longer than header, so we need to calculate them.
         int shortIdColWidth = Math.max(COL_HEADER_TRADE_SHORT_ID.length(), tradeInfo.getShortId().length());
         int roleColWidth = Math.max(COL_HEADER_TRADE_ROLE.length(), tradeInfo.getRole().length());
 

core/src/main/java/bisq/core/api/CoreTradesService.java

@@ -21,6 +21,7 @@
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.offer.Offer;
 import bisq.core.offer.takeoffer.TakeOfferModel;
+import bisq.core.trade.Tradable;
 import bisq.core.trade.Trade;
 import bisq.core.trade.TradeManager;
 import bisq.core.trade.TradeUtil;
@@ -199,7 +200,8 @@ private Optional<Trade> getOpenTrade(String tradeId) {
     }
 
     private Optional<Trade> getClosedTrade(String tradeId) {
-        return closedTradableManager.getTradableById(tradeId).map(value -> (Trade) value);
+        Optional<Tradable> tradable = closedTradableManager.getTradableById(tradeId);
+        return tradable.filter((t) -> t instanceof Trade).map(value -> (Trade) value);
     }
 
     private boolean isFollowingBuyerProtocol(Trade trade) {

core/src/main/java/bisq/core/api/CoreWalletsService.java

@@ -23,6 +23,9 @@
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.wallet.WalletsManager;
 
+import bisq.common.Timer;
+import bisq.common.UserThread;
+
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.crypto.KeyCrypterScrypt;
@@ -37,8 +40,6 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -57,7 +58,7 @@ class CoreWalletsService {
     private final BtcWalletService btcWalletService;
 
     @Nullable
-    private TimerTask lockTask;
+    private Timer lockTimer;
 
     @Nullable
     private KeyParameter tempAesKey;
@@ -190,29 +191,22 @@ void unlockWallet(String password, long timeout) {
         if (!walletsManager.checkAESKey(tempAesKey))
             throw new IllegalStateException("incorrect password");
 
-        if (lockTask != null) {
-            // The user is overriding a prior unlock timeout.  Cancel the existing
-            // lock TimerTask to prevent it from calling lockWallet() before or after the
-            // new timer task does.
-            lockTask.cancel();
-            // Avoid the synchronized(lock) overhead of an unnecessary lockTask.cancel()
-            // call the next time 'unlockwallet' is called.
-            lockTask = null;
+        if (lockTimer != null) {
+            // The user has called unlockwallet again, before the prior unlockwallet
+            // timeout has expired.  He's overriding it with a new timeout value.
+            // Remove the existing lock timer to prevent it from calling lockwallet
+            // before or after the new one does.
+            lockTimer.stop();
+            lockTimer = null;
         }
 
-        lockTask = new TimerTask() {
-            @Override
-            public void run() {
-                if (tempAesKey != null) {
-                    // Do not try to lock wallet after timeout if the user has already
-                    // done so via 'lockwallet'
-                    log.info("Locking wallet after {} second timeout expired.", timeout);
-                    tempAesKey = null;
-                }
+        lockTimer = UserThread.runAfter(() -> {
+            if (tempAesKey != null) {
+                // The unlockwallet timeout has expired;  re-lock the wallet.
+                log.info("Locking wallet after {} second timeout expired.", timeout);
+                tempAesKey = null;
             }
-        };
-        Timer timer = new Timer("Lock Wallet Timer");
-        timer.schedule(lockTask, SECONDS.toMillis(timeout));
+        }, timeout, SECONDS);
     }
 
     // Provided for automated wallet protection method testing, despite the

core/src/main/java/bisq/core/trade/TradeUtil.java

@@ -164,14 +164,13 @@ public String getMarketDescription(Trade trade) {
     }
 
     public String getPaymentMethodNameWithCountryCode(Trade trade) {
-        String paymentMethodDescription = "";
-        if (trade != null) {
-            Offer offer = trade.getOffer();
-            checkNotNull(offer);
-            checkNotNull(offer.getPaymentMethod());
-            paymentMethodDescription = offer.getPaymentMethodNameWithCountryCode();
-        }
-        return paymentMethodDescription;
+        if (trade == null)
+            return "";
+
+        Offer offer = trade.getOffer();
+        checkNotNull(offer);
+        checkNotNull(offer.getPaymentMethod());
+        return offer.getPaymentMethodNameWithCountryCode();
     }
 
     /**

desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java

@@ -215,18 +215,22 @@ String getMarketLabel(PendingTradesListItem item) {
     }
 
     public String getRemainingTradeDurationAsWords() {
+        checkNotNull(dataModel.getTrade(), "model's trade must not be null");
         return tradeUtil.getRemainingTradeDurationAsWords(dataModel.getTrade());
     }
 
     public double getRemainingTradeDurationAsPercentage() {
+        checkNotNull(dataModel.getTrade(), "model's trade must not be null");
         return tradeUtil.getRemainingTradeDurationAsPercentage(dataModel.getTrade());
     }
 
     public String getDateForOpenDispute() {
+        checkNotNull(dataModel.getTrade(), "model's trade must not be null");
         return DisplayUtils.formatDateTime(tradeUtil.getDateForOpenDispute(dataModel.getTrade()));
     }
 
     public boolean showWarning() {
+        checkNotNull(dataModel.getTrade(), "model's trade must not be null");
         Date halfTradePeriodDate = tradeUtil.getHalfTradePeriodDate(dataModel.getTrade());
         return halfTradePeriodDate != null && new Date().after(halfTradePeriodDate);
     }