Merge pull request mycelium-com#60 from mycelium-com/fix-null-tx

Fix the case when backing returns null
gkisiel · Jan 3, 2018 · b017dd2 · b017dd2
2 parents e0f7aab + 08ae88d
commit b017dd2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/mbw/build.gradle b/mbw/build.gradle
@@ -100,8 +100,8 @@ android {
     buildToolsVersion androidSdkBuildVersion
 
     defaultConfig {
-        versionCode 2091006
-        versionName '2.9.10.6'
+        versionCode 2091007
+        versionName '2.9.10.7'
         multiDexEnabled true
 
         minSdkVersion 14

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();