[CLNP-7606] feat/implement-custom-item and android 16kb support

android/build.gradle

@@ -96,7 +96,7 @@ dependencies {
   // noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:${ReactNative.ext.getVersion("android", "kotlin")}"
-  implementation("com.sendbird.sdk:sendbird-calls:1.12.1")
+  implementation("com.sendbird.sdk:sendbird-calls:1.12.3")
 }
 
 ReactNative.shared.applyPackageVersion()

android/src/main/java/com/sendbird/calls/reactnative/module/CallsCommonModule.kt

@@ -1,8 +1,11 @@
 package com.sendbird.calls.reactnative.module
 
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableNativeMap
 import com.sendbird.calls.*
+import com.sendbird.calls.internal.PushTokenType
 import com.sendbird.calls.reactnative.RNCallsInternalError
 import com.sendbird.calls.reactnative.extension.rejectCalls
 import com.sendbird.calls.reactnative.module.listener.CallsDirectCallListener
@@ -104,7 +107,7 @@ class CallsCommonModule(private val root: CallsModule): CommonModule {
 
     override fun registerPushToken(token: String, unique: Boolean, promise: Promise) {
         RNCallsLogger.d("[CommonModule] registerPushToken()")
-        SendBirdCall.registerPushToken(token, unique) { error ->
+        SendBirdCall.registerPushToken(token, PushTokenType.FCM_VOIP, unique) { error ->
             error
                 ?.let {
                     promise.rejectCalls(it)
@@ -117,7 +120,7 @@ class CallsCommonModule(private val root: CallsModule): CommonModule {
 
     override fun unregisterPushToken(token: String, promise: Promise) {
         RNCallsLogger.d("[CommonModule] unregisterPushToken()")
-        SendBirdCall.unregisterPushToken(token) { error ->
+        SendBirdCall.unregisterPushToken(token, PushTokenType.FCM_VOIP) { error ->
             error
                 ?.let {
                     promise.rejectCalls(it)
@@ -219,4 +222,50 @@ class CallsCommonModule(private val root: CallsModule): CommonModule {
                 promise.resolve(null)
             }
     }
+
+    override fun updateCustomItems(callId: String, customItems: ReadableMap, promise: Promise) {
+        RNCallsLogger.d("[CommonModule] updateCustomItems($callId)")
+       val items = CallsUtils.convertMapToHashMap(customItems)
+
+        SendBirdCall.updateCustomItems(callId, items) { updatedItems, affectedKeys, error ->
+            error?.let {
+                promise.rejectCalls(it)
+            } ?: run {
+                val result = WritableNativeMap()
+                result.putMap("updatedItems", CallsUtils.convertToJsMap(updatedItems as? Map<*, *> ?: emptyMap<String, String>()))
+                result.putArray("affectedKeys", CallsUtils.convertToJsArray(affectedKeys as? List<*> ?: emptyList<String>()))
+                promise.resolve(result)
+            }
+        }
+    }
+
+    override fun deleteCustomItems(callId: String, customItemKeys: ReadableArray, promise: Promise) {
+        RNCallsLogger.d("[CommonModule] deleteCustomItems($callId)")
+        val keys = CallsUtils.convertArrayToSet(customItemKeys)
+
+        SendBirdCall.deleteCustomItems(callId, keys) { updatedItems, affectedKeys, error ->
+            error?.let {
+                promise.rejectCalls(it)
+            } ?: run {
+                val result = WritableNativeMap()
+                result.putMap("updatedItems", CallsUtils.convertToJsMap(updatedItems as? Map<*, *> ?: emptyMap<String, String>()))
+                result.putArray("affectedKeys", CallsUtils.convertToJsArray(affectedKeys as? List<*> ?: emptyList<String>()))
+                promise.resolve(result)
+            }
+        }
+    }
+
+    override fun deleteAllCustomItems(callId: String, promise: Promise) {
+        RNCallsLogger.d("[CommonModule] deleteAllCustomItems($callId)")
+        SendBirdCall.deleteAllCustomItems(callId) { updatedItems, affectedKeys, error ->
+            error?.let {
+                promise.rejectCalls(it)
+            } ?: run {
+                val result = WritableNativeMap()
+                result.putMap("updatedItems", CallsUtils.convertToJsMap(updatedItems as? Map<*, *> ?: emptyMap<String, String>()))
+                result.putArray("affectedKeys", CallsUtils.convertToJsArray(affectedKeys as? List<*> ?: emptyList<String>()))
+                promise.resolve(result)
+            }
+        }
+    }
 }

android/src/main/java/com/sendbird/calls/reactnative/module/CallsDirectCallModule.kt

@@ -1,6 +1,7 @@
 package com.sendbird.calls.reactnative.module
 
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.sendbird.calls.AcceptParams
 import com.sendbird.calls.AudioDevice
@@ -83,7 +84,7 @@ class CallsDirectCallModule(private val root: CallsModule): DirectCallModule {
             call.setRemoteVideoView(view.getSurface())
         }
     }
-    
+
     override fun muteMicrophone(type: String, identifier: String) {
         val from = "directCall/muteMicrophone"
         RNCallsLogger.d("[DirectCallModule] $from ($identifier)")
@@ -200,4 +201,69 @@ class CallsDirectCallModule(private val root: CallsModule): DirectCallModule {
             CallsUtils.findDirectCall(identifier, from).resumeAudioTrack()
         }
     }
+
+    override fun directCallUpdateCustomItems(callId: String, customItems: ReadableMap, promise: Promise) {
+        val from = "directCall/updateCustomItems"
+        RNCallsLogger.d("[DirectCallModule] $from ($callId)")
+
+        CallsUtils.safeRun(promise) {
+            val call = CallsUtils.findDirectCall(callId, from)
+            val items = CallsUtils.convertMapToHashMap(customItems)
+
+            call.updateCustomItems(items) { updatedItems, affectedKeys, error ->
+                if (error != null) {
+                    promise.rejectCalls(error)
+                } else {
+                    val result = CallsUtils.createMap().apply {
+                        putMap("updatedItems", CallsUtils.convertHashMapToMap(updatedItems ?: hashMapOf()))
+                        putArray("affectedKeys", CallsUtils.convertListToArray(affectedKeys ?: listOf()))
+                    }
+                    promise.resolve(result)
+                }
+            }
+        }
+    }
+
+    override fun directCallDeleteCustomItems(callId: String, customItemKeys: ReadableArray, promise: Promise) {
+        val from = "directCall/deleteCustomItems"
+        RNCallsLogger.d("[DirectCallModule] $from ($callId)")
+
+        CallsUtils.safeRun(promise) {
+            val call = CallsUtils.findDirectCall(callId, from)
+            val keys = CallsUtils.convertArrayToSet(customItemKeys)
+
+            call.deleteCustomItems(keys) { updatedItems, affectedKeys, error ->
+                if (error != null) {
+                    promise.rejectCalls(error)
+                } else {
+                    val result = CallsUtils.createMap().apply {
+                        putMap("updatedItems", CallsUtils.convertHashMapToMap(updatedItems ?: hashMapOf()))
+                        putArray("affectedKeys", CallsUtils.convertListToArray(affectedKeys ?: listOf()))
+                    }
+                    promise.resolve(result)
+                }
+            }
+        }
+    }
+
+    override fun directCallDeleteAllCustomItems(callId: String, promise: Promise) {
+        val from = "directCall/deleteAllCustomItems"
+        RNCallsLogger.d("[DirectCallModule] $from ($callId)")
+
+        CallsUtils.safeRun(promise) {
+            val call = CallsUtils.findDirectCall(callId, from)
+
+            call.deleteAllCustomItems { updatedItems, affectedKeys, error ->
+                if (error != null) {
+                    promise.rejectCalls(error)
+                } else {
+                    val result = CallsUtils.createMap().apply {
+                        putMap("updatedItems", CallsUtils.convertHashMapToMap(updatedItems ?: hashMapOf()))
+                        putArray("affectedKeys", CallsUtils.convertListToArray(affectedKeys ?: listOf()))
+                    }
+                    promise.resolve(result)
+                }
+            }
+        }
+    }
 }

android/src/main/java/com/sendbird/calls/reactnative/module/CallsGroupCallModule.kt

@@ -1,6 +1,7 @@
 package com.sendbird.calls.reactnative.module
 
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.sendbird.calls.*
 import com.sendbird.calls.reactnative.RNCallsInternalError
@@ -147,4 +148,69 @@ class CallsGroupCallModule: GroupCallModule {
             CallsUtils.findRoom(identifier, from).localParticipant?.resumeAudioTrack()
         }
     }
+
+    override fun groupCallUpdateCustomItems(roomId: String, customItems: ReadableMap, promise: Promise) {
+        val from = "groupCall/updateCustomItems"
+        RNCallsLogger.d("[GroupCallModule] $from ($roomId)")
+
+        CallsUtils.safeRun(promise) {
+            val room = CallsUtils.findRoom(roomId, from)
+            val items = CallsUtils.convertMapToHashMap(customItems)
+
+            room.updateCustomItems(items) { updatedItems, affectedKeys, error ->
+                if (error != null) {
+                    promise.rejectCalls(error)
+                } else {
+                    val result = CallsUtils.createMap().apply {
+                        putMap("updatedItems", CallsUtils.convertHashMapToMap(updatedItems ?: hashMapOf()))
+                        putArray("affectedKeys", CallsUtils.convertListToArray(affectedKeys ?: listOf()))
+                    }
+                    promise.resolve(result)
+                }
+            }
+        }
+    }
+
+    override fun groupCallDeleteCustomItems(roomId: String, customItemKeys: ReadableArray, promise: Promise) {
+        val from = "groupCall/deleteCustomItems"
+        RNCallsLogger.d("[GroupCallModule] $from ($roomId)")
+
+        CallsUtils.safeRun(promise) {
+            val room = CallsUtils.findRoom(roomId, from)
+            val keys = CallsUtils.convertArrayToSet(customItemKeys)
+
+            room.deleteCustomItems(keys) { updatedItems, affectedKeys, error ->
+                if (error != null) {
+                    promise.rejectCalls(error)
+                } else {
+                    val result = CallsUtils.createMap().apply {
+                        putMap("updatedItems", CallsUtils.convertHashMapToMap(updatedItems ?: hashMapOf()))
+                        putArray("affectedKeys", CallsUtils.convertListToArray(affectedKeys ?: listOf()))
+                    }
+                    promise.resolve(result)
+                }
+            }
+        }
+    }
+
+    override fun groupCallDeleteAllCustomItems(roomId: String, promise: Promise) {
+        val from = "groupCall/deleteAllCustomItems"
+        RNCallsLogger.d("[GroupCallModule] $from ($roomId)")
+
+        CallsUtils.safeRun(promise) {
+            val room = CallsUtils.findRoom(roomId, from)
+            // There is no deleteAllCustomItems API in Android native, so handled with deleteCustomItems.
+            room.deleteCustomItems(null) { updatedItems, affectedKeys, error ->
+                if (error != null) {
+                    promise.rejectCalls(error)
+                } else {
+                    val result = CallsUtils.createMap().apply {
+                        putMap("updatedItems", CallsUtils.convertHashMapToMap(updatedItems ?: emptyMap()))
+                        putArray("affectedKeys", CallsUtils.convertListToArray(affectedKeys ?: listOf()))
+                    }
+                    promise.resolve(result)
+                }
+            }
+        }
+    }
 }

android/src/main/java/com/sendbird/calls/reactnative/module/CallsModule.kt

@@ -2,6 +2,7 @@ package com.sendbird.calls.reactnative.module
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.sendbird.calls.DirectCall
 import com.sendbird.calls.RoomInvitation
@@ -76,6 +77,9 @@ class CallsModule(val reactContext: ReactApplicationContext) : CallsModuleStruct
     override fun createRoom(params: ReadableMap, promise: Promise) = commonModule.createRoom(params, promise)
     override fun fetchRoomById(roomId: String, promise: Promise) = commonModule.fetchRoomById(roomId, promise)
     override fun getCachedRoomById(roomId: String, promise: Promise) = commonModule.getCachedRoomById(roomId, promise)
+    override fun updateCustomItems(callId: String, customItems: ReadableMap, promise: Promise) = commonModule.updateCustomItems(callId, customItems, promise)
+    override fun deleteCustomItems(callId: String, customItemKeys: ReadableArray, promise: Promise) = commonModule.deleteCustomItems(callId, customItemKeys, promise)
+    override fun deleteAllCustomItems(callId: String, promise: Promise) = commonModule.deleteAllCustomItems(callId, promise)
 
     /** Media Device control interface **/
     override fun stopVideo(type: String, identifier: String) = getControllableModule(type).stopVideo(type, identifier)
@@ -93,10 +97,16 @@ class CallsModule(val reactContext: ReactApplicationContext) : CallsModuleStruct
     override fun end(callId: String, promise: Promise)= directCallModule.end(callId, promise)
     override fun updateLocalVideoView(callId: String, videoViewId: Int)= directCallModule.updateLocalVideoView(callId, videoViewId)
     override fun updateRemoteVideoView(callId: String, videoViewId: Int)= directCallModule.updateRemoteVideoView(callId, videoViewId)
+    override fun directCallUpdateCustomItems(callId: String, customItems: ReadableMap, promise: Promise) = directCallModule.directCallUpdateCustomItems(callId, customItems, promise)
+    override fun directCallDeleteCustomItems(callId: String, customItemKeys: ReadableArray, promise: Promise) = directCallModule.directCallDeleteCustomItems(callId, customItemKeys, promise)
+    override fun directCallDeleteAllCustomItems(callId: String, promise: Promise) = directCallModule.directCallDeleteAllCustomItems(callId, promise)
 
     /** GroupCall module interface**/
     override fun enter(roomId: String, options: ReadableMap, promise: Promise) = groupCallModule.enter(roomId, options, promise)
     override fun exit(roomId: String) = groupCallModule.exit(roomId)
+    override fun groupCallUpdateCustomItems(roomId: String, customItems: ReadableMap, promise: Promise) = groupCallModule.groupCallUpdateCustomItems(roomId, customItems, promise)
+    override fun groupCallDeleteCustomItems(roomId: String, customItemKeys: ReadableArray, promise: Promise) = groupCallModule.groupCallDeleteCustomItems(roomId, customItemKeys, promise)
+    override fun groupCallDeleteAllCustomItems(roomId: String, promise: Promise) = groupCallModule.groupCallDeleteAllCustomItems(roomId, promise)
 
     /** Queries **/
     fun createDirectCallLogListQuery(params: ReadableMap, promise: Promise) = queries.createDirectCallLogListQuery(params, promise)

android/src/main/java/com/sendbird/calls/reactnative/module/CallsModuleStruct.kt

@@ -1,6 +1,7 @@
 package com.sendbird.calls.reactnative.module
 
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 
 interface CallsModuleStruct: CommonModule, DirectCallModule, GroupCallModule { }
@@ -29,18 +30,28 @@ interface CommonModule {
     fun createRoom(params: ReadableMap, promise: Promise)
     fun fetchRoomById(roomId: String, promise: Promise)
     fun getCachedRoomById(roomId: String, promise: Promise)
+
+    fun updateCustomItems(callId: String, customItems: ReadableMap, promise: Promise)
+    fun deleteCustomItems(callId: String, customItemKeys: ReadableArray, promise: Promise)
+    fun deleteAllCustomItems(callId: String, promise: Promise)
 }
 
 interface DirectCallModule: MediaDeviceControl {
     fun accept(callId: String, options: ReadableMap, holdActiveCall: Boolean, promise: Promise)
     fun end(callId: String, promise: Promise)
     fun updateLocalVideoView(callId: String, videoViewId: Int)
     fun updateRemoteVideoView(callId: String, videoViewId: Int)
+    fun directCallUpdateCustomItems(callId: String, customItems: ReadableMap, promise: Promise)
+    fun directCallDeleteCustomItems(callId: String, customItemKeys: ReadableArray, promise: Promise)
+    fun directCallDeleteAllCustomItems(callId: String, promise: Promise)
 }
 
 interface GroupCallModule: MediaDeviceControl {
     fun enter(roomId: String, options: ReadableMap, promise: Promise)
     fun exit(roomId: String)
+    fun groupCallUpdateCustomItems(roomId: String, customItems: ReadableMap, promise: Promise)
+    fun groupCallDeleteCustomItems(roomId: String, customItemKeys: ReadableArray, promise: Promise)
+    fun groupCallDeleteAllCustomItems(roomId: String, promise: Promise)
 }
 
 enum class ControllableModuleType {
@@ -58,4 +69,4 @@ interface MediaDeviceControl {
     fun selectVideoDevice(type: String, identifier: String, device: ReadableMap, promise: Promise)
     fun resumeVideoCapturer(type: String, identifier: String)
     fun resumeAudioTrack(type: String, identifier: String)
-}
+}

android/src/main/java/com/sendbird/calls/reactnative/utils/CallsUtils.kt

@@ -252,4 +252,50 @@ object CallsUtils {
         return SendBirdCall.getCachedRoomById(roomId) ?: throw RNCallsInternalError(from, RNCallsInternalError.Type.NOT_FOUND_ROOM)
     }
 
+    fun createMap(): WritableNativeMap {
+        return WritableNativeMap()
+    }
+
+    fun convertMapToHashMap(map: ReadableMap): HashMap<String, String> {
+        val hashMap = HashMap<String, String>()
+        val iterator = map.keySetIterator()
+        while (iterator.hasNextKey()) {
+            val key = iterator.nextKey()
+            hashMap[key] = map.getString(key) ?: ""
+        }
+        return hashMap
+    }
+
+    fun convertHashMapToMap(hashMap: Map<String, String>): WritableNativeMap {
+        val map = WritableNativeMap()
+        for ((key, value) in hashMap) {
+            map.putString(key, value)
+        }
+        return map
+    }
+
+    fun convertArrayToSet(array: ReadableArray): Set<String> {
+        val set = mutableSetOf<String>()
+        for (i in 0 until array.size()) {
+            set.add(array.getString(i))
+        }
+        return set
+    }
+
+    fun convertArrayToList(array: ReadableArray): List<String> {
+        val list = mutableListOf<String>()
+        for (i in 0 until array.size()) {
+            list.add(array.getString(i))
+        }
+        return list
+    }
+
+    fun convertListToArray(list: List<String>): WritableNativeArray {
+        val array = WritableNativeArray()
+        for (item in list) {
+            array.pushString(item)
+        }
+        return array
+    }
+
 }