Merge pull request #77 from muun/apollo-49.2-release-branch

Release source code for 49.2
muun · Mar 28, 2022 · 0c8baab · 0c8baab
2 parents 7c08f92 + a9a5666
commit 0c8baab
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
@@ -6,6 +6,11 @@ follow [https://changelog.md/](https://changelog.md/) guidelines.
 
 ## [Unreleased]
 
+## [49.2] - 2022-03-22
+
+### FIXED
+- A crash when you have contacts with old address versions
+- An error processing operation updates for lightning payments that made the look as if stuck pending
 
 ## [49.1] - 2022-03-17
 

diff --git a/android/apollo/src/main/java/io/muun/apollo/data/db/contact/ContactDao.java b/android/apollo/src/main/java/io/muun/apollo/data/db/contact/ContactDao.java
@@ -32,8 +32,8 @@ public Completable deleteAll() {
 
     @Override
     protected void storeUnsafe(final Contact element) {
-        final PublicKey userPublicKey = element.getPublicKeyPair().getUserPublicKey();
-        final PublicKey muunPublicKey = element.getPublicKeyPair().getMuunPublicKey();
+        final PublicKey userPublicKey = element.publicKey;
+        final PublicKey muunPublicKey = element.cosigningPublicKey;
 
         delightDb.getContactQueries().insertContact(
                 element.getId(),

diff --git a/android/apollo/src/main/java/io/muun/apollo/data/db/operation/OperationDao.kt b/android/apollo/src/main/java/io/muun/apollo/data/db/operation/OperationDao.kt
@@ -73,7 +73,7 @@ open class OperationDao
     fun updateStatus(
         operationHid: Long,
         confirmations: Long,
-        hash: String,
+        hash: String?,
         status: OperationStatus
     ) {
         delightDb.operationQueries.updateStatus(

diff --git a/android/apollo/src/main/java/io/muun/apollo/domain/model/OperationUpdated.java b/android/apollo/src/main/java/io/muun/apollo/domain/model/OperationUpdated.java
@@ -14,7 +14,8 @@ public class OperationUpdated {
     @NotNull
     public final Long confirmations;
 
-    @NotNull
+    // Null for certain kinds of lightning operations
+    @Nullable
     public final String hash;
 
     @NotNull
@@ -31,7 +32,7 @@ public class OperationUpdated {
      */
     public OperationUpdated(Long hid,
                             Long confirmations,
-                            String hash,
+                            @Nullable String hash,
                             OperationStatus status,
                             NextTransactionSize nextTransactionSize,
                             @Nullable SubmarineSwap submarineSwap) {

diff --git a/android/apolloui/build.gradle b/android/apolloui/build.gradle
@@ -80,8 +80,8 @@ android {
         applicationId "io.muun.apollo"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 901
-        versionName "49.1"
+        versionCode 902
+        versionName "49.2"
 
         // Needed to make sure these classes are available in the main DEX file for API 19
         // See: https://spin.atomicobject.com/2018/07/16/support-kitkat-multidex/

diff --git a/common/src/main/java/io/muun/common/api/messages/OperationUpdateMessage.java b/common/src/main/java/io/muun/common/api/messages/OperationUpdateMessage.java
@@ -54,7 +54,7 @@ public OperationUpdateMessage() {
      */
     public OperationUpdateMessage(Long id,
                                   Long confirmations,
-                                  String hash,
+                                  @Nullable String hash,
                                   OperationStatus status,
                                   NextTransactionSizeJson nextTransactionSize,
                                   SubmarineSwapJson swapDetails,