Merge pull request #6 from amazon-connect/mikeliao/websocket-heartbeat

Implementing WebSocketManager retry, NetworkConnectionManager and HeartbeatManager

Author: mliao95

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:name=".ChatApplication"

app/src/main/java/com/amazon/connect/chat/androidchatexample/Config.kt

@@ -3,10 +3,10 @@ package com.amazon.connect.chat.androidchatexample
 import com.amazonaws.regions.Regions
 
 object Config {
-    val connectInstanceId: String = "6ceda8ca-5e6e-4a60-9bfb-4994cc1fec79"
-    val contactFlowId: String = "c8d90d07-a28c-4a97-9dfb-f4785b98d8d2"
-    val startChatEndpoint: String = "https://3r4nj9r68b.execute-api.us-east-1.amazonaws.com/"
-    val region: Regions = Regions.US_EAST_1
+    val connectInstanceId: String = "e816d0f3-eda3-46e4-bc67-9999e621eff6"
+    val contactFlowId: String = "f22bfa3b-400e-4250-939d-90a79eb1cd24"
+    val startChatEndpoint: String = "https://bqo00ujzld.execute-api.us-west-2.amazonaws.com/"
+    val region: Regions = Regions.US_WEST_2
     val agentName = "AGENT"
     val customerName = "CUSTOMER"
 }

app/src/main/java/com/amazon/connect/chat/androidchatexample/MainActivity.kt

@@ -47,13 +47,13 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.amazon.connect.chat.androidchatexample.models.Message
-import com.amazon.connect.chat.androidchatexample.models.MessageType
-import com.amazon.connect.chat.androidchatexample.ui.theme.androidconnectchatandroidTheme
-import com.amazon.connect.chat.androidchatexample.utils.CommonUtils.Companion.keyboardAsState
-import com.amazon.connect.chat.androidchatexample.utils.ContentType
+import com.amazon.connect.chat.sdk.model.Message
+import com.amazon.connect.chat.sdk.model.MessageType
+import com.amazon.connect.chat.sdk.utils.CommonUtils.Companion.keyboardAsState
+import com.amazon.connect.chat.sdk.utils.ContentType
 import com.amazon.connect.chat.androidchatexample.viewmodel.ChatViewModel
 import com.amazon.connect.chat.androidchatexample.views.ChatMessageView
+import com.amazon.connect.chat.androidchatexample.ui.theme.androidconnectchatandroidTheme
 import com.amazon.connect.chat.sdk.GreetingFromSDK
 import dagger.hilt.android.AndroidEntryPoint
 

app/src/main/java/com/amazon/connect/chat/androidchatexample/di/AppModule.kt

@@ -2,6 +2,7 @@ package com.amazon.connect.chat.androidchatexample.di
 
 import android.content.Context
 import android.content.SharedPreferences
+import com.amazon.connect.chat.sdk.network.WebSocketManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -18,4 +19,19 @@ object AppModule {
     fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
         return context.getSharedPreferences("ConnectChat", Context.MODE_PRIVATE)
     }
+
+//    // Provide the Context dependency
+//    @Provides
+//    @Singleton
+//    fun provideContext(@ApplicationContext appContext: Context): Context {
+//        return appContext
+//    }
+//
+//    @Provides
+//    @Singleton
+//    fun provideWebSocketManager(
+//        context: Context,
+//    ): WebSocketManager {
+//        return WebSocketManager(context, {})
+//    }
 }

app/src/main/java/com/amazon/connect/chat/androidchatexample/repository/ChatRepository.kt

@@ -9,21 +9,20 @@ import com.amazonaws.services.connectparticipant.model.CreateParticipantConnecti
 import com.amazonaws.services.connectparticipant.model.CreateParticipantConnectionResult
 import com.amazonaws.services.connectparticipant.model.DisconnectParticipantRequest
 import com.amazonaws.services.connectparticipant.model.GetTranscriptRequest
-import com.amazonaws.services.connectparticipant.model.GetTranscriptResult
 import com.amazonaws.services.connectparticipant.model.SendEventRequest
 import com.amazonaws.services.connectparticipant.model.SendEventResult
 import com.amazonaws.services.connectparticipant.model.SendMessageRequest
 import com.amazonaws.services.connectparticipant.model.SendMessageResult
 import com.amazon.connect.chat.androidchatexample.Config
-import com.amazon.connect.chat.androidchatexample.models.MessageMetadata
-import com.amazon.connect.chat.androidchatexample.models.Receipt
+import com.amazon.connect.chat.sdk.model.MessageMetadata
+import com.amazon.connect.chat.sdk.model.Receipt
 import com.amazon.connect.chat.androidchatexample.models.StartChatRequest
 import com.amazon.connect.chat.androidchatexample.models.StartChatResponse
-import com.amazon.connect.chat.androidchatexample.models.TranscriptItem
-import com.amazon.connect.chat.androidchatexample.models.TranscriptResponse
+import com.amazon.connect.chat.sdk.model.TranscriptItem
+import com.amazon.connect.chat.sdk.model.TranscriptResponse
 import com.amazon.connect.chat.androidchatexample.network.ApiInterface
 import com.amazon.connect.chat.androidchatexample.network.Resource
-import com.amazon.connect.chat.androidchatexample.utils.ContentType
+import com.amazon.connect.chat.sdk.utils.ContentType
 import dagger.hilt.android.scopes.ActivityScoped
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext