@kaleyra/video-react-native-module 1.6.0 → 2.0.1

package/native-bridge/android/bridge.gradle

@@ -0,0 +1,71 @@
+def kaleyraVideoSdkVersion = "4.2.1"
+
+def gsonVersion = "2.9.1"
+def kotlinVersionVersion = "1.9.0"
+def jsonSerializationVersionVersion = "1.6.0"
+def roomVersion = "2.5.2"
+
+def junitVersion = "4.13.2"
+def mockkVersion = "1.13.1"
+def jsonVersion = "20230618"
+def coroutinesTestVersion = "1.8.0"
+def testObserverVersion = "1.6.2"
+
+apply plugin: 'kotlin-android'
+apply plugin: 'com.google.devtools.ksp'
+
+allprojects {
+    repositories {
+        google()
+        mavenLocal()
+        mavenCentral()
+        maven { url 'https://maven.bandyer.com/releases' }
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+android {
+    namespace 'com.kaleyra.video_hybrid_native_bridge'
+
+    defaultConfig {
+        compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
+        testInstrumentationRunner "com.kaleyra.video_hybrid_native_bridge.utils.RandomRunner"
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
+}
+
+dependencies {
+    implementation(platform("com.kaleyra:video-sdk-bom:$kaleyraVideoSdkVersion"))
+    implementation "com.kaleyra:video-sdk"
+    implementation "com.kaleyra:video-extension-external-camera"
+
+    implementation "com.google.code.gson:gson:$gsonVersion"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersionVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$jsonSerializationVersionVersion"
+    implementation "androidx.room:room-runtime:$roomVersion"
+    ksp "androidx.room:room-compiler:$roomVersion"
+
+    /*** Testing ***/
+    testImplementation "junit:junit:$junitVersion"
+    testImplementation "io.mockk:mockk:$mockkVersion"
+    testImplementation "org.json:json:$jsonVersion"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesTestVersion"
+    testImplementation "com.github.ologe:flow-test-observer:$testObserverVersion"
+}

package/native-bridge/android/build.gradle

@@ -1,63 +1,7 @@
-buildscript {
-  ext.kotlin_version = '1.6.10'
-  repositories {
-    google()
-    mavenLocal()
-    mavenCentral()
-    maven { url 'https://maven.bandyer.com/releases' }
-    maven { url 'https://jitpack.io' }
-  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:7.1.2'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
-}
-
-allprojects {
-  repositories {
-    google()
-    mavenLocal()
-    mavenCentral()
-    maven { url 'https://maven.bandyer.com/releases' }
-    maven { url 'https://jitpack.io' }
-  }
-}
-
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-
-android {
-  compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
-
-  defaultConfig {
-    minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-    testInstrumentationRunner "com.kaleyra.video_hybrid_native_bridge.utils.RandomRunner"
-  }
-
-  sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
-  }
-
-  testOptions {
-    unitTests.returnDefaultValues = true
-  }
-
+plugins {
+  id 'com.android.library' version "8.1.1"
+  id 'org.jetbrains.kotlin.android' version "1.9.0"
+  id 'com.google.devtools.ksp' version "1.9.0-1.0.13"
 }
 
-dependencies {
-  implementation 'com.google.code.gson:gson:2.9.1'
-  implementation "com.kaleyra:collaboration-suite-utils:3.0.6"
-  implementation "com.bandyer:bandyer-android-sdk:3.10.0"
-  implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-  compileOnly "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1"
-  implementation "androidx.room:room-runtime:2.4.0-beta02"
-  kapt "androidx.room:room-compiler:2.4.0-beta02"
-
-  /*** Testing ***/
-  testImplementation 'junit:junit:4.13.2'
-  testImplementation 'io.mockk:mockk:1.13.2'
-  testImplementation "org.json:json:20180813"
-  testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
-  testImplementation "com.github.ologe:flow-test-observer:1.5.1"
-}
+apply from: "bridge.gradle"

package/native-bridge/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/native-bridge/android/settings.gradle

@@ -1 +1,9 @@
+pluginManagement {
+  repositories {
+    google()
+    mavenCentral()
+    gradlePluginPortal()
+  }
+}
+
 rootProject.name = 'video_hybrid_native_bridge'

package/native-bridge/android/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.kaleyra.video_hybrid_native_bridge" />
+<manifest />

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/DTOs.kt

@@ -205,6 +205,8 @@ data class Region (
 )
 
 /**
+ * Video Module Tools
+ *
  * Define the tools to use
  */
 data class Tools (
@@ -355,53 +357,17 @@ data class Session (
  */
 data class UserDetails (
     /**
-     * Email of the user
-     */
-    val email: String? = null,
-
-    /**
-     * First name of the user
-     */
-    val firstName: String? = null,
-
-    /**
-     * Last name of the user
-     */
-    val lastName: String? = null,
-
-    /**
-     * Nickname for the user
+     * Image url to use as placeholder for the user.
      */
-    val nickName: String? = null,
+    val imageURL: String? = null,
 
     /**
-     * Image url to use as placeholder for the user.
+     * The user's display name.
      */
-    val profileImageURL: String? = null,
+    val name: String? = null,
 
     /**
      * User identifier
      */
     val userID: String
 )
-
-/**
- * This is used to display the user details in the call/chat UI
- */
-data class UserDetailsFormat (
-    /**
-     * Format to be used when displaying an android notification
-     * <br/>
-     * <br/>
-     * <b><font color="blue">default</font>: equals to UserDetailsFormatter.default</b>
-     */
-    val androidNotification: String? = null,
-
-    /**
-     * Format to be used to display a user details on the call/chat UI
-     * <br/>
-     * <br/>
-     * <b><font color="blue">default</font>: ${userAlias}</b>
-     */
-    val default: String
-)

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/SDKAccessTokenProviderProxy.kt

@@ -3,14 +3,16 @@
 
 package com.kaleyra.video_hybrid_native_bridge
 
-import com.bandyer.android_sdk.client.AccessTokenProvider
-import com.bandyer.android_sdk.client.Completion
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
-internal class SDKAccessTokenProviderProxy(val tokenProvider: CrossPlatformAccessTokenProvider) : AccessTokenProvider {
-    override fun provideAccessToken(userId: String, completion: Completion<String>) {
-        tokenProvider.provideAccessToken(userId) {
-            if (it.isSuccess) completion.success(it.getOrThrow())
-            else completion.error(it.exceptionOrNull() ?: Throwable("connection error"))
+internal class SDKAccessTokenProviderProxy(val tokenProvider: CrossPlatformAccessTokenProvider) {
+    suspend fun provideAccessToken(userId: String): Result<String> {
+        return suspendCoroutine { continuation ->
+            tokenProvider.provideAccessToken(userId) {
+                if (it.isSuccess) continuation.resume(Result.success(it.getOrThrow()))
+                else continuation.resume(Result.failure(it.exceptionOrNull() ?: Throwable("connection error")))
+            }
         }
     }
 }

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/VideoHybridBridge.kt

@@ -16,6 +16,4 @@ interface VideoHybridBridge : CachedUserConnector, UserInterfacePresenter, Cache
     val tokenProvider: CrossPlatformAccessTokenProvider
 
     val eventsEmitter: EventsEmitter
-    fun verifyCurrentCall(verify: Boolean)
-    fun handlePushNotificationPayload(payload: String)
 }

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/VideoSDKHybridBridge.kt

@@ -3,12 +3,11 @@
 
 package com.kaleyra.video_hybrid_native_bridge
 
-import com.bandyer.android_sdk.client.BandyerSDK
-import com.bandyer.android_sdk.client.BandyerSDKInstance
+import com.kaleyra.video_common_ui.KaleyraVideo
 import com.kaleyra.video_hybrid_native_bridge.configurator.CachedSDKConfigurator
 import com.kaleyra.video_hybrid_native_bridge.configurator.VideoSDKConfigurator
-import com.kaleyra.video_hybrid_native_bridge.connector.VideoSDKCachedUserConnector
 import com.kaleyra.video_hybrid_native_bridge.connector.CachedUserConnector
+import com.kaleyra.video_hybrid_native_bridge.connector.VideoSDKCachedUserConnector
 import com.kaleyra.video_hybrid_native_bridge.events.EventsEmitter
 import com.kaleyra.video_hybrid_native_bridge.events.EventsReporter
 import com.kaleyra.video_hybrid_native_bridge.events.reporter.SDKEventsReporter
@@ -22,26 +21,23 @@ import kotlinx.coroutines.asCoroutineDispatcher
 import java.util.concurrent.Executors
 
 class VideoSDKHybridBridge(
-  override val contextContainer: ContextContainer,
-  override val tokenProvider: CrossPlatformAccessTokenProvider,
-  override val eventsEmitter: EventsEmitter,
-  private val sdk: BandyerSDKInstance = BandyerSDK.getInstance(),
-  private val presenter: UserInterfacePresenter = SDKUserInterfacePresenter(sdk, contextContainer),
-  private val backgroundScope: CoroutineScope = CoroutineScope(Executors.newSingleThreadExecutor().asCoroutineDispatcher()),
-  private val eventsReporter: EventsReporter = SDKEventsReporter.create(sdk, eventsEmitter, backgroundScope),
-  private val repository: VideoHybridBridgeRepository = VideoHybridBridgeRepository.getInstance(contextContainer.context.applicationContext),
-  private val connector: CachedUserConnector = VideoSDKCachedUserConnector(sdk, repository, tokenProvider, eventsReporter, backgroundScope),
-  private val userDetails: CachedUserDetails = SDKCachedUserDetails(sdk, contextContainer, repository, backgroundScope),
-  private val createCallOptionsProxy: CreateCallOptionsProxy = CreateCallOptionsProxy(),
-  private val configurator: CachedSDKConfigurator = VideoSDKConfigurator(sdk, createCallOptionsProxy, repository, backgroundScope),
+    override val contextContainer: ContextContainer,
+    override val tokenProvider: CrossPlatformAccessTokenProvider,
+    override val eventsEmitter: EventsEmitter,
+    private val sdk: KaleyraVideo = KaleyraVideo,
+    private val backgroundScope: CoroutineScope = CoroutineScope(Executors.newSingleThreadExecutor().asCoroutineDispatcher()),
+    private val eventsReporter: EventsReporter = SDKEventsReporter.create(sdk, eventsEmitter, backgroundScope),
+    private val repository: VideoHybridBridgeRepository = VideoHybridBridgeRepository.getInstance(contextContainer.context.applicationContext),
+    private val connector: CachedUserConnector = VideoSDKCachedUserConnector(sdk, repository, tokenProvider, eventsReporter, backgroundScope),
+    private val userDetails: CachedUserDetails = SDKCachedUserDetails(sdk, repository, backgroundScope),
+    private val configurator: CachedSDKConfigurator = VideoSDKConfigurator(sdk, repository, backgroundScope),
+    private val presenter: UserInterfacePresenter = SDKUserInterfacePresenter(sdk, contextContainer, configurator),
 ) : VideoHybridBridge,
     CachedUserConnector by connector,
     UserInterfacePresenter by presenter,
     CachedUserDetails by userDetails,
     CachedSDKConfigurator by configurator {
 
-    override fun handlePushNotificationPayload(payload: String) = sdk.handleNotification(payload.replace("\\", ""))
-
     override fun reset() {
         configurator.reset()
         clearUserCache()
@@ -53,12 +49,6 @@ class VideoSDKHybridBridge(
     }
 
     override fun startCall(callOptions: CreateCallOptions) {
-        createCallOptionsProxy.createCallOptions = callOptions
         presenter.startCall(callOptions)
     }
-
-    override fun verifyCurrentCall(verify: Boolean) {
-        val ongoingCall = sdk.callModule?.ongoingCall ?: return
-        sdk.callModule?.setVerified(ongoingCall, verify)
-    }
 }

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/configurator/VideoSDKConfigurator.kt

@@ -3,9 +3,13 @@
 
 package com.kaleyra.video_hybrid_native_bridge.configurator
 
-import com.bandyer.android_sdk.client.BandyerSDKInstance
+import com.kaleyra.video_common_ui.CallUI
+import com.kaleyra.video_common_ui.ChatUI
+import com.kaleyra.video_common_ui.KaleyraVideo
+import com.kaleyra.video_common_ui.PushNotificationHandlingStrategy
 import com.kaleyra.video_hybrid_native_bridge.KaleyraVideoConfiguration
-import com.kaleyra.video_hybrid_native_bridge.CreateCallOptionsProxy
+import com.kaleyra.video_hybrid_native_bridge.extensions.toCallActions
+import com.kaleyra.video_hybrid_native_bridge.extensions.toChatActions
 import com.kaleyra.video_hybrid_native_bridge.extensions.toSDK
 import com.kaleyra.video_hybrid_native_bridge.repository.ConfigurationEntity
 import com.kaleyra.video_hybrid_native_bridge.repository.VideoHybridBridgeRepository
@@ -13,34 +17,38 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 internal class VideoSDKConfigurator(
-    private val sdk: BandyerSDKInstance,
-    private val createCallOptionsProxy: CreateCallOptionsProxy,
-    private val repository: VideoHybridBridgeRepository,
-    private val scope: CoroutineScope
+  private val sdk: KaleyraVideo,
+  private val repository: VideoHybridBridgeRepository,
+  private val scope: CoroutineScope
 ) : CachedSDKConfigurator {
 
-    override var lastConfiguration: KaleyraVideoConfiguration? = null
+  override var lastConfiguration: KaleyraVideoConfiguration? = null
 
-    override fun configureBridge(configuration: KaleyraVideoConfiguration) {
-        scope.launch {
-            repository.configurationDao().insert(ConfigurationEntity(configuration))
-            sdk.configure(configuration.toSDK(createCallOptionsProxy))
-            lastConfiguration = configuration
-        }
+  override fun configureBridge(configuration: KaleyraVideoConfiguration) {
+    scope.launch {
+      repository.configurationDao().insert(ConfigurationEntity(configuration))
+      sdk.configure(configuration.toSDK())
+      sdk.conference.callActions = configuration.tools?.toCallActions() ?: CallUI.Action.default
+      sdk.conversation.chatActions = configuration.tools?.toChatActions() ?: ChatUI.Action.default
+      lastConfiguration = configuration
+      sdk.pushNotificationHandlingStrategy = PushNotificationHandlingStrategy.Manual
     }
-
-    override fun reset() {
-        scope.launch {
-            repository.clearAllTables()
-            sdk.reset()
-            lastConfiguration = null
-        }
+  }
+
+  override fun reset() {
+    scope.launch {
+      repository.clearAllTables()
+      sdk.reset()
+      KaleyraVideo.conference.callActions = CallUI.Action.default
+      KaleyraVideo.conversation.chatActions = ChatUI.Action.default
+      lastConfiguration = null
     }
+  }
 
-    init {
-        scope.launch {
-            lastConfiguration = repository.configurationDao().configuration?.plugin
-        }
+  init {
+    scope.launch {
+      lastConfiguration = repository.configurationDao().configuration?.plugin
     }
+  }
 
 }

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/connector/VideoSDKCachedUserConnector.kt

@@ -4,10 +4,10 @@
 package com.kaleyra.video_hybrid_native_bridge.connector
 
 import androidx.annotation.VisibleForTesting
-import com.bandyer.android_sdk.client.BandyerSDKInstance
-import com.bandyer.android_sdk.client.Session
+import com.kaleyra.video_common_ui.KaleyraVideo
 import com.kaleyra.video_hybrid_native_bridge.CrossPlatformAccessTokenProvider
 import com.kaleyra.video_hybrid_native_bridge.SDKAccessTokenProviderProxy
+import com.kaleyra.video_hybrid_native_bridge.Session
 import com.kaleyra.video_hybrid_native_bridge.events.EventsReporter
 import com.kaleyra.video_hybrid_native_bridge.repository.ConnectedUserEntity
 import com.kaleyra.video_hybrid_native_bridge.repository.VideoHybridBridgeRepository
@@ -15,7 +15,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 internal class VideoSDKCachedUserConnector(
-    private val sdk: BandyerSDKInstance,
+    private val sdk: KaleyraVideo,
     private val repository: VideoHybridBridgeRepository,
     private val tokenProvider: CrossPlatformAccessTokenProvider,
     private val eventsReporter: EventsReporter,
@@ -31,8 +31,10 @@ internal class VideoSDKCachedUserConnector(
         scope.launch {
             repository.connectedUserDao().insert(ConnectedUserEntity(userID))
             eventsReporter.start()
-            sdk.connect(Session(userID, accessTokenProviderProxy))
-            lastConnectedUserId = userID
+            val connectedUser = kotlin.runCatching {
+                sdk.connect(userID) { accessTokenProviderProxy.provideAccessToken(userID) }.await()
+            }.getOrNull()
+            lastConnectedUserId = connectedUser?.userId
         }
     }
 

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/events/reporter/CallEventsReporter.kt

@@ -3,52 +3,44 @@
 
 package com.kaleyra.video_hybrid_native_bridge.events.reporter
 
-import androidx.appcompat.app.AppCompatActivity
-import com.bandyer.android_sdk.call.CallException
-import com.bandyer.android_sdk.call.CallObserver
-import com.bandyer.android_sdk.call.CallUIObserver
-import com.bandyer.android_sdk.client.BandyerSDKInstance
-import com.bandyer.android_sdk.intent.call.Call
+import com.kaleyra.video.conference.Call
+import com.kaleyra.video_common_ui.KaleyraVideo
 import com.kaleyra.video_hybrid_native_bridge.events.Events.CallError
 import com.kaleyra.video_hybrid_native_bridge.events.EventsEmitter
 import com.kaleyra.video_hybrid_native_bridge.events.EventsReporter
-import java.lang.ref.WeakReference
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 
 class CallEventsReporter(
-    private val sdk: BandyerSDKInstance,
-    private val eventsEmitter: EventsEmitter
-) : EventsReporter, CallObserver, CallUIObserver {
+    private val sdk: KaleyraVideo,
+    private val eventsEmitter: EventsEmitter,
+    private val coroutineScope: CoroutineScope
+) : EventsReporter {
 
     private val failedCalls = HashMap<String, Call>()
 
+    private var job: Job? = null
+
     override fun start() {
-        sdk.callModule!!.addCallObserver(this)
-        sdk.callModule!!.addCallUIObserver(this)
+        stop()
+        job = sdk.conference.call
+            .flatMapLatest { call -> call.state.map { call to it } }
+            .onEach { (call, callState) ->
+                if (callState is Call.State.Disconnected.Ended.Error) {
+                    val id = call.id
+                    if (failedCalls.containsKey(id)) return@onEach
+                    failedCalls[id] = call
+                    eventsEmitter.sendEvent(CallError, callState.reason)
+                }
+            }.launchIn(coroutineScope)
     }
 
     override fun stop() {
-        sdk.callModule!!.removeCallObserver(this)
-        sdk.callModule!!.removeCallUIObserver(this)
-    }
-
-    override fun onCallEndedWithError(call: Call, callException: CallException) {
-        val id = call.callInfo.callId
-        if (failedCalls.containsKey(id)) return
-        failedCalls[id] = call
-        eventsEmitter.sendEvent(CallError, callException.localizedMessage)
+        job?.cancel()
+        job = null
     }
-
-    override fun onActivityError(call: Call, activity: WeakReference<AppCompatActivity>, error: CallException) {
-        val id = call.callInfo.callId
-        if (failedCalls.containsKey(id)) return
-        failedCalls[id] = call
-        eventsEmitter.sendEvent(CallError, error.localizedMessage)
-    }
-
-    override fun onCallCreated(call: Call) = Unit
-    override fun onCallEnded(call: Call) = Unit
-    override fun onCallStarted(call: Call) = Unit
-
-    override fun onActivityDestroyed(call: Call, activity: WeakReference<AppCompatActivity>) = Unit
-    override fun onActivityStarted(call: Call, activity: WeakReference<AppCompatActivity>) = Unit
 }

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/events/reporter/ChatEventsReporter.kt

@@ -3,41 +3,51 @@
 
 package com.kaleyra.video_hybrid_native_bridge.events.reporter
 
-import androidx.appcompat.app.AppCompatActivity
-import com.bandyer.android_sdk.chat.ChatException
-import com.bandyer.android_sdk.chat.ChatObserver
-import com.bandyer.android_sdk.chat.ChatUIObserver
-import com.bandyer.android_sdk.client.BandyerSDKInstance
-import com.bandyer.android_sdk.intent.chat.Chat
+import com.kaleyra.video.conversation.Chat
+import com.kaleyra.video_common_ui.KaleyraVideo
 import com.kaleyra.video_hybrid_native_bridge.events.Events.ChatError
 import com.kaleyra.video_hybrid_native_bridge.events.EventsEmitter
 import com.kaleyra.video_hybrid_native_bridge.events.EventsReporter
-import java.lang.ref.WeakReference
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
 
 class ChatEventsReporter(
-    private val sdk: BandyerSDKInstance,
-    private val eventsEmitter: EventsEmitter
-) : EventsReporter, ChatObserver, ChatUIObserver {
+    private val sdk: KaleyraVideo,
+    private val eventsEmitter: EventsEmitter,
+    private val coroutineScope: CoroutineScope
+) : EventsReporter {
 
     private val failedChats = HashMap<String, Chat>()
 
+    private val chatJobs = HashMap<String, Job>()
+
+    private var job: Job? = null
+
     override fun start() {
-        sdk.chatModule?.addChatObserver(this)
-        sdk.chatModule?.addChatUIObserver(this)
+        stop()
+        job = sdk.conversation.chats
+            .onEach { chats ->
+                chats.forEach { chat ->
+                    chatJobs[chat.id]?.cancel()
+                    chatJobs[chat.id] = chat.state.onEach eachState@ { state ->
+                        if (state is Chat.State.Closed.Error) {
+                            val id = chat.id
+                            if (failedChats.containsKey(id)) return@eachState
+                            failedChats[id] = chat
+                            eventsEmitter.sendEvent(ChatError, state.reason)
+                        }
+                    }.launchIn(coroutineScope)
+                }
+            }
+            .onCompletion { chatJobs.values.forEach { it.cancel() } }
+            .launchIn(coroutineScope)
     }
 
     override fun stop() {
-        sdk.chatModule?.removeChatObserver(this)
-        sdk.chatModule?.removeChatUIObserver(this)
+        job?.cancel()
+        job = null
     }
-
-    override fun onActivityError(chat: Chat, activity: WeakReference<AppCompatActivity>, error: ChatException) {
-        val id = chat.chatInfo.chatId
-        if (failedChats.containsKey(id)) return
-        failedChats[id] = chat
-        eventsEmitter.sendEvent(ChatError, error.localizedMessage)
-    }
-
-    override fun onActivityStarted(chat: Chat, activity: WeakReference<AppCompatActivity>) = Unit
-    override fun onActivityDestroyed(chat: Chat, activity: WeakReference<AppCompatActivity>) = Unit
 }

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/events/reporter/CrossPlatformModuleStatus.kt

@@ -3,27 +3,26 @@
 
 package com.kaleyra.video_hybrid_native_bridge.events.reporter
 
-import com.bandyer.android_sdk.module.BandyerModuleStatus
-import com.bandyer.android_sdk.module.BandyerModuleStatus.CONNECTED
-import com.bandyer.android_sdk.module.BandyerModuleStatus.CONNECTING
-import com.bandyer.android_sdk.module.BandyerModuleStatus.DISCONNECTED
-import com.bandyer.android_sdk.module.BandyerModuleStatus.FAILED
-import com.bandyer.android_sdk.module.BandyerModuleStatus.READY
+import com.kaleyra.video.State
 import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Connecting
 import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Failed
-import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Ready
-import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Stopped
+import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Disconnected
+import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Connected
+import com.kaleyra.video_hybrid_native_bridge.events.reporter.CrossPlatformModuleStatus.Reconnecting
 
 enum class CrossPlatformModuleStatus {
-    Ready,
+    Disconnected,
     Connecting,
-    Stopped,
+    Connected,
+    Reconnecting,
     Failed
 }
 
-internal fun BandyerModuleStatus.toCrossPlatformModuleStatus(): String = when (this) {
-    CONNECTING       -> Connecting.name.lowercase()
-    CONNECTED, READY -> Ready.name.lowercase()
-    DISCONNECTED     -> Stopped.name.lowercase()
-    FAILED           -> Failed.name.lowercase()
+internal fun State.toCrossPlatformModuleStatus(previousState: State?): String? = when {
+    previousState is State.Connected && this is State.Connecting -> Reconnecting.name.lowercase()
+    this is State.Connecting         -> Connecting.name.lowercase()
+    this is State.Connected          -> Connected.name.lowercase()
+    this is State.Disconnected.Error -> Failed.name.lowercase()
+    this is State.Disconnected       -> Disconnected.name.lowercase()
+    else -> null
 }