we don't want to run the null check on a blocking thread if it is null

xmtp · Dec 16, 2023 · c0a3317 · c0a3317
1 parent 1b93063
commit c0a3317
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/library/src/main/java/org/xmtp/android/library/SigningKey.kt b/library/src/main/java/org/xmtp/android/library/SigningKey.kt
@@ -33,8 +33,10 @@ fun SigningKey.createIdentity(
         secp256K1Uncompressed = identity.publicKey.secp256K1Uncompressed
     }.build()
 
-    runBlocking {
-        preCreateIdentityCallback?.invoke()
+    preCreateIdentityCallback?.let {
+        runBlocking {
+            it.invoke()
+        }
     }
 
     val signatureClass = Signature.newBuilder().build()

diff --git a/library/src/main/java/org/xmtp/android/library/messages/EncryptedPrivateKeyBundle.kt b/library/src/main/java/org/xmtp/android/library/messages/EncryptedPrivateKeyBundle.kt
@@ -12,9 +12,12 @@ fun EncryptedPrivateKeyBundle.decrypted(
     key: SigningKey,
     preEnableIdentityCallback: PreEventCallback? = null,
 ): PrivateKeyBundle {
-    runBlocking {
-        preEnableIdentityCallback?.invoke()
+    preEnableIdentityCallback?.let {
+        runBlocking {
+            it.invoke()
+        }
     }
+
     val signature = runBlocking {
         key.sign(
             message = Signature.newBuilder().build()

diff --git a/library/src/main/java/org/xmtp/android/library/messages/PrivateKeyBundle.kt b/library/src/main/java/org/xmtp/android/library/messages/PrivateKeyBundle.kt
@@ -27,9 +27,13 @@ fun PrivateKeyBundle.encrypted(
 ): EncryptedPrivateKeyBundle {
     val bundleBytes = toByteArray()
     val walletPreKey = SecureRandom().generateSeed(32)
-    runBlocking {
-        preEnableIdentityCallback?.invoke()
+
+    preEnableIdentityCallback?.let {
+        runBlocking {
+            it.invoke()
+        }
     }
+
     val signature =
         runBlocking {
             key.sign(