Modified logic to handle previous chat ended events (#42)

Author: mrajatttt

chat-sdk/src/main/java/com/amazon/connect/chat/sdk/network/WebSocketManager.kt

@@ -62,7 +62,6 @@ class WebSocketManagerImpl @Inject constructor(
 ) : WebSocketManager {
 
     private val coroutineScope = CoroutineScope(dispatcher + SupervisorJob())
-    private var latestParticipantJoinedTimestamp: String? = null
 
     private val client: OkHttpClient = OkHttpClient.Builder()
         .pingInterval(60, TimeUnit.SECONDS)
@@ -287,14 +286,7 @@ class WebSocketManagerImpl @Inject constructor(
                 WebSocketMessageType.EVENT -> {
                     val eventTypeString = jsonObject.optString("ContentType")
                     when (val eventType = ContentType.fromType(eventTypeString)) {
-                        ContentType.JOINED -> {
-                            val timestamp = jsonObject.getString("AbsoluteTime")
-                            if (latestParticipantJoinedTimestamp == null
-                                || timestamp > (latestParticipantJoinedTimestamp ?: "")) {
-                                latestParticipantJoinedTimestamp = timestamp
-                            }
-                            handleParticipantEvent(jsonObject, jsonString)
-                        }
+                        ContentType.JOINED -> handleParticipantEvent(jsonObject, jsonString)
                         ContentType.LEFT -> handleParticipantEvent(jsonObject, jsonString)
                         ContentType.TYPING -> handleTyping(jsonObject, jsonString)
                         ContentType.ENDED -> handleChatEnded(jsonObject, jsonString)
@@ -443,11 +435,9 @@ class WebSocketManagerImpl @Inject constructor(
     private suspend fun handleChatEnded(innerJson: JSONObject, rawData: String): TranscriptItem {
         val time = innerJson.getString("AbsoluteTime")
         val eventId = innerJson.getString("Id")
+        val isFromPastSession = innerJson.optBoolean("isFromPastSession", false)
 
-        // Check if the event belongs to a previous transcript
-        val isOlderEvent = latestParticipantJoinedTimestamp?.let { time < it } == true
-
-        if (!isOlderEvent) {
+        if (!isFromPastSession) {
             // Current session event: Reset state and update session
             resetHeartbeatManagers()
             this._eventPublisher.emit(ChatEvent.ChatEnded)

chat-sdk/src/main/java/com/amazon/connect/chat/sdk/repository/ChatService.kt

@@ -416,6 +416,15 @@ class ChatServiceImpl @Inject constructor(
 
     override suspend fun disconnectChatSession(): Result<Boolean> {
         return runCatching {
+            // Check if the chat session is active
+            if (!connectionDetailsProvider.isChatSessionActive()) {
+                webSocketManager.disconnect("Session inactive")
+                clearSubscriptionsAndPublishers()
+                SDKLogger.logger.logDebug { "Chat session is inactive. Disconnecting websocket and clearing resources." }
+                return Result.success(true) // Successfully handled the inactive session case
+            }
+
+            // Proceed with the disconnection logic
             val connectionDetails = connectionDetailsProvider.getConnectionDetails()
                 ?: throw Exception("No connection details available")
             awsClient.disconnectParticipantConnection(connectionDetails.connectionToken)

chat-sdk/src/main/java/com/amazon/connect/chat/sdk/utils/TranscriptItemUtils.kt

@@ -84,7 +84,8 @@ object TranscriptItemUtils {
                 "Content" to (item.content ?: ""),
                 "Type" to item.type,
                 "DisplayName" to (item.displayName ?: ""),
-                "Attachments" to attachmentsArray
+                "Attachments" to attachmentsArray,
+                "isFromPastSession" to true // Mark all these items as coming from a past session
             )
 
             // Serialize the dictionary to JSON string

chat-sdk/version.properties

@@ -1,3 +1,3 @@
-sdkVersion=1.0.4
+sdkVersion=1.0.5
 groupId=software.aws.connect
 artifactId=amazon-connect-chat-android