Add retry connection flow

WalletConnect · Aug 30, 2024 · 2dbab7b · 2dbab7b
1 parent c8c53b7
commit 2dbab7b
Show file tree

Hide file tree

Showing 18 changed files with 330 additions and 294 deletions.
diff --git a/...kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt b/...kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt
@@ -15,7 +15,6 @@ class ConditionalExponentialBackoffStrategy(
     override var shouldBackoff: Boolean = false
 
     fun shouldBackoff(shouldBackoff: Boolean) {
-        println("kobe:be Sending shouldBackoff: $shouldBackoff")
         this.shouldBackoff = shouldBackoff
     }
 

diff --git a/...kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt b/...kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import com.tinder.scarlet.Lifecycle
 import com.tinder.scarlet.ShutdownReason
 import com.tinder.scarlet.lifecycle.LifecycleRegistry
+import com.walletconnect.foundation.network.ConnectionLifecycle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -34,7 +35,6 @@ internal class DefaultConnectionLifecycle(
     }
 
     override fun reconnect() {
-        println("kobe: reconnect()")
         lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason())
         lifecycleRegistry.onNext(Lifecycle.State.Started)
     }
@@ -44,13 +44,11 @@ internal class DefaultConnectionLifecycle(
         var job: Job? = null
 
         override fun onActivityPaused(activity: Activity) {
-            println("kobe: pause")
             isResumed = false
 
             job = scope.launch {
                 delay(TimeUnit.SECONDS.toMillis(30))
                 if (!isResumed) {
-                    println("kobe: onPaused; disconnect()")
                     lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused")))
                     job = null
                     _onResume.value = false
@@ -59,7 +57,6 @@ internal class DefaultConnectionLifecycle(
         }
 
         override fun onActivityResumed(activity: Activity) {
-            println("kobe: resume")
             isResumed = true
 
             if (job?.isActive == true) {

diff --git a/.../kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt b/.../kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt
@@ -4,6 +4,7 @@ package com.walletconnect.android.internal.common.connection
 
 import com.tinder.scarlet.Lifecycle
 import com.tinder.scarlet.lifecycle.LifecycleRegistry
+import com.walletconnect.foundation.network.ConnectionLifecycle
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 

diff --git a/...android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt b/...android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt
@@ -1,7 +1,6 @@
 package com.walletconnect.android.internal.common.di
 
 import com.squareup.moshi.Moshi
-import com.walletconnect.android.internal.common.connection.ConnectionLifecycle
 import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle
 import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle
 import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer
@@ -13,6 +12,7 @@ import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc
 import com.walletconnect.android.pairing.model.PairingJsonRpcMethod
 import com.walletconnect.android.pairing.model.PairingRpc
 import com.walletconnect.android.relay.ConnectionType
+import com.walletconnect.foundation.network.ConnectionLifecycle
 import com.walletconnect.utils.JsonAdapterEntry
 import com.walletconnect.utils.addDeserializerEntry
 import com.walletconnect.utils.addSerializerEntry
@@ -23,13 +23,6 @@ import org.koin.dsl.module
 import kotlin.reflect.KClass
 
 
-fun Scope.getConnectionLifecycle(connectionType: ConnectionType): ConnectionLifecycle =
-    if (connectionType == ConnectionType.MANUAL) {
-        get<ManualConnectionLifecycle>(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE))
-    } else {
-        get<DefaultConnectionLifecycle>(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE))
-    }
-
 @JvmSynthetic
 fun coreJsonRpcModule(connectionType: ConnectionType) = module {
 
@@ -40,7 +33,6 @@ fun coreJsonRpcModule(connectionType: ConnectionType) = module {
             jsonRpcHistory = get(),
             pushMessageStorage = get(),
             logger = get(named(AndroidCommonDITags.LOGGER)),
-            connectionLifecycle = getConnectionLifecycle(connectionType),
             backoffStrategy = get()
         )
     }