Merge branch 'main' of github.com:QuickBlox/android-ui-kit

Author: kirillTolmachev

README.md

@@ -64,9 +64,6 @@ repositories {
     maven {
         url "https://github.com/QuickBlox/android-ui-kit-releases/raw/master/"
     }
-    maven {
-        url "https://github.com/QuickBlox/android-ai-releases/raw/main/"
-    }
     maven {
         url "https://github.com/QuickBlox/quickblox-android-sdk-releases/raw/master/"
     }
@@ -77,7 +74,7 @@ Then need to add implementation of QuickBlox UIKit and QuickBlox SDK to dependen
 
 ```
 dependencies {
-    implementation "com.quickblox:android-ui-kit:0.2.4"
+    implementation "com.quickblox:android-ui-kit:0.7.0"
 
     implementation 'com.quickblox:quickblox-android-sdk-messages:4.1.1'
     implementation 'com.quickblox:quickblox-android-sdk-chat:4.1.1'

ui-kit/build.gradle

@@ -10,7 +10,7 @@ ext {
     qbSdkVersion = '4.1.1'
 
     uiKitVersionCode = 1
-    uiKitVersionName = "0.2.4"
+    uiKitVersionName = "0.7.0"
 }
 
 android {
@@ -69,9 +69,9 @@ dependencies {
     api "com.quickblox:quickblox-android-sdk-content:$qbSdkVersion"
 
     // QuickBlox AI
-    api "com.quickblox:android-ai-answer-assistant:1.0.1"
-    api "com.quickblox:android-ai-translate:1.0.0"
-    api "com.quickblox:android-ai-editing-assistant:1.0.0"
+    api "com.quickblox:android-ai-answer-assistant:2.0.0"
+    api "com.quickblox:android-ai-translate:2.0.0"
+    api "com.quickblox:android-ai-editing-assistant:2.1.0"
 
     implementation 'androidx.fragment:fragment-ktx:1.5.6'
     implementation 'androidx.core:core-ktx:1.9.0'
@@ -95,6 +95,7 @@ dependencies {
     testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    testImplementation 'org.json:json:20231013'
 }
 
 kapt {

ui-kit/src/androidTest/java/com/quickblox/android_ui_kit/BaseTest.kt

@@ -18,21 +18,21 @@ import com.quickblox.core.exception.QBResponseException
 import com.quickblox.users.QBUsers
 import com.quickblox.users.model.QBUser
 
-const val APP_ID = "75949"
-const val AUTH_KEY = "DdS7zxMEm5Q7DaS"
-const val AUTH_SECRET = "g88RhdOjnDOqFkv"
-const val ACCOUNT_KEY = "uK_8uinNyz8-npTNB6tx"
+const val APP_ID = ""
+const val AUTH_KEY = ""
+const val AUTH_SECRET = ""
+const val ACCOUNT_KEY = ""
 
-const val USER_LOGIN = "qwe11"
-const val USER_ID = 109364779
-const val USER_PASSWORD = "quickblox"
+const val USER_LOGIN = ""
+const val USER_ID = 0
+const val USER_PASSWORD = ""
 
-const val OPPONENT_LOGIN = "qwe22"
-const val OPPONENT_ID = 109364799
-const val OPPONENT_PASSWORD = "quickblox"
+const val OPPONENT_LOGIN = ""
+const val OPPONENT_ID = 0
+const val OPPONENT_PASSWORD = ""
 
-const val USER_OPPONENT_ID_1 = 109364799
-const val USER_OPPONENT_ID_2 = 131163237
+const val USER_OPPONENT_ID_1 = 0
+const val USER_OPPONENT_ID_2 = 0
 
 open class BaseTest {
     private var loggedUser: QBUser? = null

ui-kit/src/androidTest/java/com/quickblox/android_ui_kit/domain/DialogsEventUseCaseIntegrationTest.kt

@@ -17,6 +17,7 @@ import com.quickblox.android_ui_kit.data.repository.event.EventsRepositoryImpl
 import com.quickblox.android_ui_kit.data.repository.file.FilesRepositoryImpl
 import com.quickblox.android_ui_kit.data.repository.message.MessagesRepositoryImpl
 import com.quickblox.android_ui_kit.data.repository.user.UsersRepositoryImpl
+import com.quickblox.android_ui_kit.data.source.ai.AIDataSourceImpl
 import com.quickblox.android_ui_kit.data.source.local.LocalDataSourceImpl
 import com.quickblox.android_ui_kit.data.source.local.LocalFileDataSourceImpl
 import com.quickblox.android_ui_kit.data.source.remote.RemoteDataSource
@@ -107,6 +108,7 @@ class DialogsEventUseCaseIntegrationTest : BaseTest() {
 
         val localDataSource = LocalDataSourceImpl()
         val remoteDataSource = buildRemoteDataSource(1)
+        val aiDataSource = AIDataSourceImpl()
 
         val connectionRepository = ConnectionRepositoryImpl(remoteDataSource)
         val dialogsRepository = DialogsRepositoryImpl(remoteDataSource, localDataSource)

ui-kit/src/androidTest/java/com/quickblox/android_ui_kit/domain/SendChatMessageWithContentUseCaseIntegrationTest.kt

@@ -33,6 +33,7 @@ import com.quickblox.chat.model.QBChatMessage
 import com.quickblox.chat.model.QBDialogType
 import com.quickblox.users.model.QBUser
 import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertTrue
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.catch
@@ -132,8 +133,7 @@ class SendChatMessageWithContentUseCaseIntegrationTest : BaseTest() {
         assertEquals(0, loadMessagesLatch.count)
 
         val receivedContentUrl = lastLoadedMessageFromRest?.getMediaContent()?.getUrl()
-        val createdContentUrl = createdMessage.getMediaContent()?.getUrl()
-        assertEquals(createdContentUrl, receivedContentUrl)
+        assertTrue(receivedContentUrl!!.contains("https://api.quickblox.com/blobs"))
 
         val receivedMimeType = lastLoadedMessageFromRest?.getMediaContent()?.getMimeType()
         val createdMimeType = createdMessage.getMediaContent()?.getMimeType()
@@ -236,7 +236,7 @@ class SendChatMessageWithContentUseCaseIntegrationTest : BaseTest() {
     private fun subscribeToReceiveDialogChatMessage(
         createdContent: MediaContentEntity,
         createdDialog: DialogEntity,
-        receivedMessageLatch: CountDownLatch
+        receivedMessageLatch: CountDownLatch,
     ) {
         val qbDialog = QBChatDialog()
         qbDialog.dialogId = createdDialog.getDialogId()!!