refactor(samples): Bump to 1.3.0 [APICSA-1647] (#35)

* Bump to 1.3.0-alpha.3

* Use Record<string, any> in react package

* Revert "Use Record<string, any> in react package"

This reverts commit ba04cab.

* Update ios-chat to use swift wrappers

* Bump android apps to 1.3.0

* Bump iOS and react to 1.3.0

Author: salvodicara

contact-center/android-chat/app/build.gradle

@@ -82,7 +82,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Vonage Client SDK
-    implementation("com.vonage:client-sdk-chat:1.2.1")
+    implementation("com.vonage:client-sdk-chat:1.3.0")
 
     // Dagger - HILT (Dependency Injector)
     implementation 'com.google.dagger:hilt-android:2.45'

contact-center/android-chat/app/src/main/java/com/example/vonage/chatsampleapp/chat/ChatClientManager.kt

@@ -99,34 +99,34 @@ class ChatClientManager(
     suspend fun getConversations(pageSize: Int = Constants.PAGE_SIZE,
                                  cursor: String? = null,
                                  order: PresentingOrder = Constants.DEFAULT_ORDER) : ConversationsPage =
-        client.getConversations(order, pageSize, cursor)
+        client.getConversations(GetConversationsParameters(order, pageSize, cursor))
 
     suspend fun getMembers(pageSize: Int = Constants.PAGE_SIZE,
                           cursor: String? = null,
                           order: PresentingOrder = Constants.DEFAULT_ORDER,
                            conversationId: ConversationId = currentConversation.id) : MembersPage =
-        client.getConversationMembers(conversationId, order, pageSize, cursor)
+        client.getConversationMembers(conversationId, GetConversationMembersParameters(order, pageSize, cursor))
 
     suspend fun getEvents(pageSize: Int = Constants.PAGE_SIZE,
                           cursor: String? = null,
                           order: PresentingOrder = Constants.DEFAULT_ORDER,
                           conversationId: ConversationId = currentConversation.id) : EventsPage =
-        client.getConversationEvents(conversationId, order, pageSize, cursor)
+        client.getConversationEvents(conversationId, GetConversationEventsParameters(order, pageSize, cursor))
 
     suspend fun createConversation(name: String, displayName: String?) : ConversationId =
-        client.createConversation(name, displayName)
+        client.createConversation(CreateConversationParameters(name, displayName))
 
     suspend fun joinConversation(conversationId: ConversationId) : MemberId =
         client.joinConversation(conversationId)
 
     private suspend fun hasNoOtherMembers(conversationId: ConversationId) : Boolean {
-        val page = client.getConversationMembers(pageSize = 2, cid = conversationId)
+        val page = client.getConversationMembers(conversationId, GetConversationMembersParameters(pageSize = 2))
         return page.members.none { it.user?.name != currentUser.name }
     }
 
     suspend fun leaveConversation(conversationId: ConversationId){
         client.leaveConversation(conversationId)
-        //TODO: Check ASYNCHRONOUSLY if Conversation Needs to be cleaned up
+        // Check ASYNCHRONOUSLY if Conversation Needs to be cleaned up
         CoroutineScope(Dispatchers.IO).launch {
             if(hasNoOtherMembers(conversationId)){
                 deleteConversation(conversationId)
@@ -191,6 +191,7 @@ class ChatClientManager(
             is MessageVideoEvent -> "$sender has sent a video in the conversation ${event.conversationId}"
             is CustomConversationEvent -> "$sender has sent a custom event in the conversation ${event.conversationId}"
             is EphemeralConversationEvent -> "$sender has sent an ephemeral event in the conversation ${event.conversationId}"
+            is EventDeleteConversationEvent -> "$sender has deleted event body ${event.body} in conversation ${event.conversationId}"
         }
 
         // TODO: Provide utility to parse Conversation?

contact-center/android-chat/app/src/main/java/com/example/vonage/chatsampleapp/data/PagingDataSource.kt

@@ -40,7 +40,7 @@ class PagingDataSource<T : Any, PageT: Page>(
             val data : List<T> = when(response){
                 is ConversationsPage -> (response.conversations as List<T>)
                 is MembersPage -> (response.members.filterNot {
-                    // TODO: Filter Out Members who left
+                    // Filter Out Members who left
                     it.state == MemberState.LEFT
                 } as List<T>)
                 is EventsPage -> (response.events as List<T>)

contact-center/android-chat/app/src/main/java/com/example/vonage/chatsampleapp/view/ConversationDetailsActivity.kt

@@ -74,7 +74,7 @@ class ConversationDetailsActivity : ComponentActivity() {
                 LaunchedEffect(true){
                     val conversationDetails = viewModel.getConversationDetails()
                     // Possible use: handle Custom Data
-                    conversationDetails?.customData
+                    conversationDetails?.properties?.customData
                 }
                 ConversationDetailsScreen(
                     conversationName,

contact-center/android-chat/app/src/main/java/com/example/vonage/chatsampleapp/view/ui/composables/ConversationEventItem.kt

@@ -128,7 +128,9 @@ fun ConversationEventItem(
                 senderImageUrl = senderImageUrl,
                 time = time
             )
-        is CustomConversationEvent, is EphemeralConversationEvent -> {
+        is CustomConversationEvent,
+        is EphemeralConversationEvent,
+        is EventDeleteConversationEvent -> {
         //NOOP
         }
     }

contact-center/android-voice/app/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Vonage Client SDK
-    implementation("com.vonage:client-sdk:1.2.1")
+    implementation("com.vonage:client-sdk:1.3.0")
 
     // Retrofit + Moshi (HTTP Client)
     def retrofit_version = "2.9.0"

contact-center/android-voice/app/src/main/java/com/example/vonage/voicesampleapp/activities/CallActivity.kt

@@ -9,6 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.telecom.Connection
 import android.view.View
+import androidx.core.content.ContextCompat
 import com.example.vonage.voicesampleapp.App
 import com.example.vonage.voicesampleapp.R
 import com.example.vonage.voicesampleapp.databinding.ActivityCallBinding
@@ -51,11 +52,8 @@ class CallActivity : AppCompatActivity() {
                 fallbackState = if(it) Connection.STATE_DISCONNECTED else null
             }
             // Call State Updated
-            intent?.getStringExtra(CALL_STATE)?.let {
-                setStateUI()
-                if(it == CALL_DISCONNECTED){
-                    finish()
-                }
+            intent?.getStringExtra(CALL_STATE)?.let { callStateExtra ->
+                setStateUI(callStateExtra)
             }
         }
     }
@@ -65,7 +63,12 @@ class CallActivity : AppCompatActivity() {
         setContentView(binding.root)
         handleIntent(intent)
         setBindings()
-        registerReceiver(messageReceiver, IntentFilter(MESSAGE_ACTION))
+        ContextCompat.registerReceiver(
+            this,
+            messageReceiver,
+            IntentFilter(MESSAGE_ACTION),
+            ContextCompat.RECEIVER_NOT_EXPORTED
+        )
     }
 
     override fun onDestroy() {
@@ -104,10 +107,10 @@ class CallActivity : AppCompatActivity() {
         userName.text = coreContext.activeCall?.callerDisplayName ?: fallbackUsername
     }
 
-    private fun setStateUI() = binding.run {
-        val state = coreContext.activeCall?.state ?: fallbackState
+    private fun setStateUI(callStateExtra: String? = null) = binding.run {
+        val callState = coreContext.activeCall?.state ?: fallbackState
         //Buttons Visibility
-        if(state == Connection.STATE_RINGING){
+        if(callState == Connection.STATE_RINGING){
             btnAnswer.visibility = View.VISIBLE
             btnReject.visibility = View.VISIBLE
             btnHangup.visibility = View.GONE
@@ -122,15 +125,21 @@ class CallActivity : AppCompatActivity() {
             btnKeypad.visibility = View.VISIBLE
         }
         //Background Color and State label
-        val (backgroundColor, stateLabel) = when(state) {
+        val (backgroundColor, stateLabel) = when(callStateExtra){
+            CALL_RECONNECTING -> R.color.gray to R.string.call_state_reconnecting_label
+            else -> null
+        } ?: when(callState) {
             Connection.STATE_RINGING -> R.color.gray to R.string.call_state_ringing_label
             Connection.STATE_DIALING -> R.color.gray to R.string.call_state_dialing_label
             Connection.STATE_ACTIVE -> R.color.green to R.string.call_state_active_label
             Connection.STATE_DISCONNECTED -> R.color.red to R.string.call_state_remotely_disconnected_label
             else -> R.color.red to R.string.call_state_locally_disconnected_label
         }
         cardView.setCardBackgroundColor(getColor(backgroundColor))
-        callState.text = getString(stateLabel)
+        callStateLabel.text = getString(stateLabel)
+        if(callStateExtra == CALL_DISCONNECTED){
+            finish()
+        }
     }
 
     private fun onAnswer(){
@@ -181,6 +190,8 @@ class CallActivity : AppCompatActivity() {
         const val IS_MUTED = "isMuted"
         const val CALL_STATE = "callState"
         const val CALL_ANSWERED = "answered"
+        const val CALL_RECONNECTING = "reconnecting"
+        const val CALL_RECONNECTED = "reconnected"
         const val CALL_DISCONNECTED = "disconnected"
         const val IS_REMOTE_DISCONNECT = "isRemoteDisconnect"
     }

contact-center/android-voice/app/src/main/java/com/example/vonage/voicesampleapp/core/VoiceClientManager.kt

@@ -39,7 +39,6 @@ class VoiceClientManager(private val context: Context) {
 
     private fun initClient(){
         val config = VGClientInitConfig(LoggingLevel.Info)
-
         client = VoiceClient(context, config)
     }
 
@@ -99,6 +98,27 @@ class VoiceClientManager(private val context: Context) {
             }
         }
 
+        client.setOnCallMediaDisconnectListener { callId, reason ->
+            println("Call $callId has been disconnected with reason: ${reason.name}")
+            takeIfActive(callId)?.apply {
+                cleanUp(DisconnectCause(DisconnectCause.ERROR), isRemote = false)
+            }
+        }
+
+        client.setOnCallMediaReconnectingListener { callId ->
+            println("Call $callId is reconnecting")
+            takeIfActive(callId)?.apply {
+                notifyCallReconnectingToCallActivity(context)
+            }
+        }
+
+        client.setOnCallMediaReconnectionListener { callId ->
+            println("Call $callId has successfully reconnected")
+            takeIfActive(callId)?.apply {
+                notifyCallReconnectedToCallActivity(context)
+            }
+        }
+
         client.setCallInviteCancelListener { callId, reason ->
             println("Invite to Call $callId has been canceled with reason: ${reason.name}")
             takeIfActive(callId)?.apply {

contact-center/android-voice/app/src/main/java/com/example/vonage/voicesampleapp/telecom/TelecomHelper.kt

@@ -56,6 +56,8 @@ class TelecomHelper(private val context: Context) {
         PhoneAccount
             .builder(phoneAccountHandle, CUSTOM_PHONE_ACCOUNT_NAME)
             .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
+            // To handle calls with your custom UI change it to:
+            // .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
             .setIcon(Icon.createWithResource(context, R.drawable.vonage_logo_svg))
             .build()
             .also {

contact-center/android-voice/app/src/main/java/com/example/vonage/voicesampleapp/utils/NavigationUtils.kt

@@ -81,6 +81,18 @@ internal fun notifyCallAnsweredToCallActivity(context: Context) {
     sendMessageToCallActivity(context, extras)
 }
 
+internal fun notifyCallReconnectingToCallActivity(context: Context) {
+    val extras = Bundle()
+    extras.putString(CallActivity.CALL_STATE, CallActivity.CALL_RECONNECTING)
+    sendMessageToCallActivity(context, extras)
+}
+
+internal fun notifyCallReconnectedToCallActivity(context: Context) {
+    val extras = Bundle()
+    extras.putString(CallActivity.CALL_STATE, CallActivity.CALL_RECONNECTED)
+    sendMessageToCallActivity(context, extras)
+}
+
 internal fun notifyCallDisconnectedToCallActivity(context: Context, isRemote:Boolean) {
     val extras = Bundle()
     extras.putString(CallActivity.CALL_STATE, CallActivity.CALL_DISCONNECTED)