Merge pull request #49 from nova-wallet/develop

v1.7.2
novasamatech · Nov 18, 2022 · 4dc5207 · 4dc5207
2 parents 910bf7a + 3552972
commit 4dc5207
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.7.1'
+        versionName = '1.7.2'
         versionCode = 1
 
         // SDK and tools

diff --git a/.../soramitsu/fearless_utils/wsrpc/request/runtime/storage/StorageSubscriptionMultiplexer.kt b/.../soramitsu/fearless_utils/wsrpc/request/runtime/storage/StorageSubscriptionMultiplexer.kt
@@ -13,8 +13,15 @@ class StorageSubscriptionMultiplexer(
 
     class Change(val block: String, val key: String, val value: String?)
 
-    fun createRequest(): RuntimeRequest {
-        return SubscribeStorageRequest(callbacks.keys.toList())
+    /**
+     * @return subscription request. Null if there were nothing to subscribe for
+     */
+    fun createRequest(): RuntimeRequest? {
+        return if (callbacks.isNotEmpty()) {
+            SubscribeStorageRequest(callbacks.keys.toList())
+        } else {
+            null
+        }
     }
 
     override fun onNext(response: SubscriptionChange) {
@@ -48,8 +55,10 @@ class StorageSubscriptionMultiplexer(
     }
 }
 
-fun SocketService.subscribeUsing(multiplexer: StorageSubscriptionMultiplexer): SocketService.Cancellable {
+fun SocketService.subscribeUsing(multiplexer: StorageSubscriptionMultiplexer): SocketService.Cancellable? {
     val request = multiplexer.createRequest()
 
-    return subscribe(request, multiplexer, UnsubscribeMethodResolver.resolve(request.method))
+    return request?.let {
+        subscribe(request, multiplexer, UnsubscribeMethodResolver.resolve(request.method))
+    }
 }