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

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

@@ -3,40 +3,31 @@
 
 package com.kaleyra.video_hybrid_native_bridge.user_details
 
-import com.bandyer.android_sdk.client.BandyerSDKInstance
-import com.bandyer.android_sdk.client.Completion
-import com.bandyer.android_sdk.utils.provider.UserDetailsProvider
-import com.kaleyra.video_hybrid_native_bridge.ContextContainer
+import android.net.Uri
+import com.kaleyra.video_common_ui.KaleyraVideo
 import com.kaleyra.video_hybrid_native_bridge.UserDetails
-import com.kaleyra.video_hybrid_native_bridge.UserDetailsFormat
+import com.kaleyra.video_hybrid_native_bridge.extensions.toDatabaseEntity
 import com.kaleyra.video_hybrid_native_bridge.extensions.toSDK
 import com.kaleyra.video_hybrid_native_bridge.extensions.toUserDetails
-import com.kaleyra.video_hybrid_native_bridge.extensions.toUserDetailsEntity
 import com.kaleyra.video_hybrid_native_bridge.repository.VideoHybridBridgeRepository
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
-import kotlin.collections.forEach
 
 internal class SDKCachedUserDetails(
-  private val sdk: BandyerSDKInstance,
-  private val contextContainer: ContextContainer,
-  private val repository: VideoHybridBridgeRepository,
-  private val coroutineScope: CoroutineScope
+    private val sdk: KaleyraVideo,
+    private val repository: VideoHybridBridgeRepository,
+    private val coroutineScope: CoroutineScope,
 ) : CachedUserDetails {
-    override fun setUserDetailsFormat(format: UserDetailsFormat) = sdk.setUserDetailsFormatter(CachedUserDetailsFormatter(contextContainer.context.applicationContext, format))
 
     override val cachedUserDetails = androidx.collection.ArraySet<UserDetails>()
+
     override fun addUsersDetails(userDetails: Array<UserDetails>) {
         coroutineScope.launch {
-            val usersDao = userDetails.filter { it.userID.isNotBlank() }.map {
-                com.bandyer.android_sdk.utils.provider.UserDetails.Builder(it.userID).build().copy(
-                    nickName = it.nickName,
-                    firstName = it.firstName,
-                    lastName = it.lastName,
-                    email = it.email,
-                    imageUrl = it.profileImageURL
-                ).toUserDetailsEntity()
-            }
+            val usersDao = userDetails
+                .filter { it.userID.isNotBlank() }
+                .map { it.toDatabaseEntity() }
+
             if (usersDao.isEmpty()) return@launch
             repository.userDao().insert(usersDao)
             cachedUserDetails.addAll(userDetails)
@@ -45,16 +36,17 @@ internal class SDKCachedUserDetails(
     }
 
     private fun setDetailsProvider() {
-        sdk.setUserDetailsProvider(object : UserDetailsProvider {
-            override fun onUserDetailsRequested(userAliases: List<String>, completion: Completion<Iterable<com.bandyer.android_sdk.utils.provider.UserDetails>>) {
-                coroutineScope.launch {
-                    val details = userAliases.map { userAlias ->
-                        repository.userDao().getUserDetailsEntity(userAlias)?.toSDK() ?: com.bandyer.android_sdk.utils.provider.UserDetails.Builder(userAlias).build()
+        sdk.userDetailsProvider = { userIds: List<String> ->
+            coroutineScope.async {
+                Result.success(
+                    userIds.map { userAlias ->
+                        cachedUserDetails.firstOrNull { it.userID == userAlias }?.toSDK()
+                            ?: repository.userDao().getUserDetailsEntity(userAlias)?.toSDK()
+                            ?: com.kaleyra.video_common_ui.model.UserDetails(userAlias, userAlias, Uri.EMPTY)
                     }
-                    completion.success(details)
-                }
-            }
-        })
+                )
+            }.await()
+        }
     }
 
     override fun removeUserDetails() {