Fix the case when backing returns NULL;

Remove the inconsistency beetween Colu server and WAPI server when a transaction is expired
hyb1234hi · Jan 2, 2018 · 1e89952 · 1e89952
1 parent e0f7aab
commit 1e89952
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/mbw/src/main/java/com/mycelium/wallet/colu/ColuAccount.java b/mbw/src/main/java/com/mycelium/wallet/colu/ColuAccount.java
@@ -389,6 +389,7 @@ private List<TransactionSummary> getTransactionSummaries() {
 
          if (extendedInfo == null) {
             Log.d(TAG, "Extended info for hash " + hash + " not found !");
+            continue;
          }
 
          // is it a BTC transaction or an asset transaction ?

diff --git a/wapi/src/main/java/com/mycelium/wapi/wallet/AbstractAccount.java b/wapi/src/main/java/com/mycelium/wapi/wallet/AbstractAccount.java
@@ -861,6 +861,9 @@ public NetworkParameters getNetwork() {
    public static final int COLU_MAX_DUST_OUTPUT_SIZE_MAINNET = 6000;
 
    private boolean isColuTransaction(Transaction tx) {
+      if (tx == null) {
+         return false;
+      }
       for(int i = 0 ; i < tx.outputs.length;i++) {
          TransactionOutput curOutput = tx.outputs[i];
          byte[] scriptBytes = curOutput.script.getScriptBytes();