Merge pull request #11 from QuickBlox/rc-0.8.0

0.8.0

Author: vdovbnya-qb

README.md

@@ -74,7 +74,7 @@ Then need to add implementation of QuickBlox UIKit and QuickBlox SDK to dependen
 
 ```
 dependencies {
-    implementation "com.quickblox:android-ui-kit:0.7.0"
+    implementation "com.quickblox:android-ui-kit:0.8.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,10 +10,12 @@ ext {
     qbSdkVersion = '4.1.1'
 
     uiKitVersionCode = 1
-    uiKitVersionName = "0.7.0"
+    uiKitVersionName = "0.8.0"
 }
 
 android {
+    namespace = "com.quickblox.android_ui_kit"
+
     compileSdk 33
 
     defaultConfig {
@@ -46,6 +48,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     compileOptions {

ui-kit/src/main/java/com/quickblox/android_ui_kit/QuickBloxUiKit.kt

@@ -21,7 +21,10 @@ import com.quickblox.android_ui_kit.presentation.factory.DefaultScreenFactory
 import com.quickblox.android_ui_kit.presentation.factory.ScreenFactory
 import com.quickblox.android_ui_kit.presentation.theme.LightUIKitTheme
 import com.quickblox.android_ui_kit.presentation.theme.UiKitTheme
-import java.util.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.util.Locale
 
 @ExcludeFromCoverage
 object QuickBloxUiKit {
@@ -87,6 +90,17 @@ object QuickBloxUiKit {
         setupLanguageToAITranslate(defaultLanguage)
     }
 
+    fun release(errorCallback: (t: String) -> Unit = {}) {
+        CoroutineScope(Dispatchers.Main).runCatching {
+            launch {
+                dependency?.getConnectionRepository()?.disconnect()
+                dependency?.getDialogsRepository()?.clearAllDialogsInLocal()
+            }
+        }.onFailure {
+            errorCallback.invoke(it.message ?: "Error release QuickBloxUiKit")
+        }
+    }
+
     private fun getDefaultLanguage(): Languages {
         val systemLanguageName = getSystemLanguageName()
         var defaultLanguage: Languages

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/source/remote/RemoteDataSourceImpl.kt

@@ -28,6 +28,7 @@ import com.quickblox.android_ui_kit.data.source.remote.mapper.RemotePaginationDT
 import com.quickblox.android_ui_kit.data.source.remote.mapper.RemoteUserDTOMapper
 import com.quickblox.android_ui_kit.data.source.remote.parser.EventMessageParser
 import com.quickblox.android_ui_kit.domain.exception.repository.MappingException
+import com.quickblox.auth.model.QBProvider
 import com.quickblox.auth.session.QBSessionManager
 import com.quickblox.auth.session.Query
 import com.quickblox.chat.JIDHelper
@@ -353,14 +354,14 @@ open class RemoteDataSourceImpl : RemoteDataSource {
 
     @VisibleForTesting
     open fun getLoggedUserIdOrThrowException(): Int {
-        val loggedUserId = getLoggedUserIdFromSession()
+        val loggedUserId = getLoggedUserIdFromSessionOrChat()
         if (loggedUserId == null) {
             throw RuntimeException("The logged userId is null")
         }
         return loggedUserId
     }
 
-    private fun getLoggedUserIdFromSession(): Int? {
+    private fun getLoggedUserIdFromSessionOrChat(): Int? {
         val userIdFromSession = QBSessionManager.getInstance().activeSession?.userId ?: 0
         if (userIdFromSession > 0) {
             return userIdFromSession
@@ -370,6 +371,12 @@ open class RemoteDataSourceImpl : RemoteDataSource {
         if (userIdFromSessionParameters > 0) {
             return userIdFromSessionParameters
         }
+
+        val userIdFromChatService = QBChatService.getInstance().user?.id ?: 0
+        if (userIdFromChatService > 0) {
+            return userIdFromChatService
+        }
+
         return null
     }
 
@@ -601,7 +608,7 @@ open class RemoteDataSourceImpl : RemoteDataSource {
         blobId?.let { id ->
             try {
                 val file = QBContent.getFile(id).perform()
-                return file.publicUrl
+                return file.privateUrl
             } catch (exception: QBResponseException) {
                 Log.e(TAG, exception.message.toString())
             }
@@ -965,10 +972,19 @@ open class RemoteDataSourceImpl : RemoteDataSource {
             throw exceptionFactory.makeUnexpected("You have already logged to chat")
         }
 
-        val login = QBSessionManager.getInstance().sessionParameters?.userLogin
-        val password = QBSessionManager.getInstance().sessionParameters?.userPassword
+        val login: String?
+        val password: String?
         val userId = getLoggedUserId()
 
+        if (isSessionCreatedBySocialProvider()) {
+            val user = loadUserById(userId)
+            login = user?.login
+            password = QBSessionManager.getInstance().token
+        } else {
+            login = QBSessionManager.getInstance().sessionParameters?.userLogin
+            password = QBSessionManager.getInstance().sessionParameters?.userPassword
+        }
+
         val isNotValidLogin = login.isNullOrEmpty()
         val isNotValidPassword = password.isNullOrEmpty()
         val isNotValidUserId = userId < 0
@@ -994,6 +1010,16 @@ open class RemoteDataSourceImpl : RemoteDataSource {
         }
     }
 
+    private fun isSessionCreatedBySocialProvider(): Boolean {
+        val socialProvider = QBSessionManager.getInstance().sessionParameters?.socialProvider
+
+        val isFacebookProvider = socialProvider == QBProvider.FACEBOOK
+        val isFirebaseProvider = socialProvider == QBProvider.FIREBASE_PHONE
+        val isTwitterProvider = socialProvider == QBProvider.TWITTER
+
+        return isFacebookProvider || isFirebaseProvider || isTwitterProvider
+    }
+
     private fun removeMessageListeners() {
         QBChatService.getInstance().messageStatusesManager?.removeMessageStatusListener(statusMessageListener)
         QBChatService.getInstance().incomingMessagesManager?.removeDialogMessageListrener(chatMessageListener)

ui-kit/src/main/java/com/quickblox/android_ui_kit/domain/usecases/ConnectionUseCase.kt

@@ -16,7 +16,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 
-class ConnectionUseCase : BaseUseCase<Unit>() {
+class ConnectionUseCase(private val errorCallback: () -> Unit = {}) : BaseUseCase<Unit>() {
     private val TAG = ConnectionUseCase::javaClass.name
     private var connectionRepository = QuickBloxUiKit.getDependency().getConnectionRepository()
 
@@ -28,7 +28,7 @@ class ConnectionUseCase : BaseUseCase<Unit>() {
         }
 
         scope.launch {
-            connect()
+            connect(errorCallback)
         }
     }
 

ui-kit/src/main/java/com/quickblox/android_ui_kit/presentation/dialogs/PositiveNegativeDialog.kt

@@ -22,7 +22,8 @@ class PositiveNegativeDialog private constructor(
     private val negativeText: String,
     private val themeDialog: UiKitTheme?,
     private val positiveListener: (() -> Unit)? = null,
-    private val negativeListener: (() -> Unit)? = null
+    private val negativeListener: (() -> Unit)? = null,
+    private val canceledOnTouchOutside: Boolean = true,
 ) : Dialog(context, R.style.RoundedCornersDialog) {
     companion object {
         fun show(
@@ -32,10 +33,18 @@ class PositiveNegativeDialog private constructor(
             negativeText: String,
             themeDialog: UiKitTheme?,
             positiveListener: (() -> Unit)? = null,
-            negativeListener: (() -> Unit)? = null
+            negativeListener: (() -> Unit)? = null,
+            canceledOnTouchOutside: Boolean = true,
         ) {
             PositiveNegativeDialog(
-                context, text, positiveText, negativeText, themeDialog, positiveListener, negativeListener
+                context,
+                text,
+                positiveText,
+                negativeText,
+                themeDialog,
+                positiveListener,
+                negativeListener,
+                canceledOnTouchOutside
             ).show()
         }
     }
@@ -57,6 +66,7 @@ class PositiveNegativeDialog private constructor(
         binding.tvNegative.text = negativeText
 
         setClickListeners(binding)
+        setCanceledOnTouchOutside(canceledOnTouchOutside)
     }
 
     private fun applyParams() {