Clean up kotlin code

xmtp · Dec 22, 2023 · 08649d7 · 08649d7
1 parent 3650b8d
commit 08649d7
Showing 1 changed file with 22 additions and 24 deletions.
diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
@@ -17,8 +17,8 @@ import expo.modules.xmtpreactnativesdk.wrappers.DecodedMessageWrapper
 import expo.modules.xmtpreactnativesdk.wrappers.DecryptedLocalAttachment
 import expo.modules.xmtpreactnativesdk.wrappers.EncryptedLocalAttachment
 import expo.modules.xmtpreactnativesdk.wrappers.PreparedLocalMessage
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -127,8 +127,9 @@ class XMTPModule : Module() {
     private val isDebugEnabled = BuildConfig.DEBUG // TODO: consider making this configurable
     private val conversations: MutableMap<String, Conversation> = mutableMapOf()
     private val subscriptions: MutableMap<String, Job> = mutableMapOf()
-    var waitForPreEnableIdentityCallback: Boolean = false
-    var waitForPreCreateIdentityCallback: Boolean = false
+    private var preEnableIdentityCallbackDeferred: CompletableDeferred<Unit>? = null
+    private var preCreateIdentityCallbackDeferred: CompletableDeferred<Unit>? = null
+
 
     override fun definition() = ModuleDefinition {
         Name("XMTP")
@@ -155,8 +156,10 @@ class XMTPModule : Module() {
             val reactSigner = ReactNativeSigner(module = this@XMTPModule, address = address)
             signer = reactSigner
 
-            waitForPreEnableIdentityCallback = hasEnableIdentityCallback == true
-            waitForPreCreateIdentityCallback = hasCreateIdentityCallback == true
+            if (hasCreateIdentityCallback == true) 
+                preCreateIdentityCallbackDeferred = CompletableDeferred()
+            if (hasEnableIdentityCallback == true) 
+                preEnableIdentityCallbackDeferred = CompletableDeferred()
             val preCreateIdentityCallback: PreEventCallback? =
                 preCreateIdentityCallback.takeIf { hasCreateIdentityCallback == true }
             val preEnableIdentityCallback: PreEventCallback? =
@@ -182,8 +185,10 @@ class XMTPModule : Module() {
             logV("createRandom")
             val privateKey = PrivateKeyBuilder()
 
-            waitForPreEnableIdentityCallback = hasEnableIdentityCallback == true
-            waitForPreCreateIdentityCallback = hasCreateIdentityCallback == true
+            if (hasCreateIdentityCallback == true) 
+                preCreateIdentityCallbackDeferred = CompletableDeferred()
+            if (hasEnableIdentityCallback == true) 
+                preEnableIdentityCallbackDeferred = CompletableDeferred()
             val preCreateIdentityCallback: PreEventCallback? =
                 preCreateIdentityCallback.takeIf { hasCreateIdentityCallback == true }
             val preEnableIdentityCallback: PreEventCallback? =
@@ -600,16 +605,14 @@ class XMTPModule : Module() {
             client.contacts.consentList.entries.map { ConsentWrapper.encode(it.value) }
         }
 
-        Function("preEnableIdentityCallbackCompleted") { 
-            logV("preEnableIdentityCallbackCompleted")
-            waitForPreEnableIdentityCallback = false
-            true
-        }
-
         Function("preCreateIdentityCallbackCompleted") {
             logV("preCreateIdentityCallbackCompleted")
-            waitForPreCreateIdentityCallback = false
-            true
+            preCreateIdentityCallbackDeferred?.complete(Unit)
+        }
+
+        Function("preEnableIdentityCallbackCompleted") { 
+            logV("preEnableIdentityCallbackCompleted")
+            preEnableIdentityCallbackDeferred?.complete(Unit)
         }
     }
 
@@ -736,19 +739,14 @@ class XMTPModule : Module() {
 
     private val preEnableIdentityCallback: suspend () -> Unit = {
         sendEvent("preEnableIdentityCallback")
-        waitForCallback { waitForPreEnableIdentityCallback }
+        preEnableIdentityCallbackDeferred?.await()
+        preCreateIdentityCallbackDeferred == null
     }
 
     private val preCreateIdentityCallback: suspend () -> Unit = {
         sendEvent("preCreateIdentityCallback")
-        waitForCallback { waitForPreCreateIdentityCallback }
-    }
-
-    // Helper function to wait for a callback
-    private suspend fun waitForCallback(check: () -> Boolean) {
-        while (check()) {
-            delay(100) // Wait for 100ms before checking again
-        }
+        preCreateIdentityCallbackDeferred?.await()
+        preCreateIdentityCallbackDeferred = null
     }
 }