Merge pull request #12 from QuickBlox/rc-0.9.0

0.9.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.8.0"
+    implementation "com.quickblox:android-ui-kit:0.9.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.8.0"
+    uiKitVersionName = "0.9.0"
 }
 
 android {

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

@@ -64,6 +64,8 @@ object QuickBloxUiKit {
     private var translateTemperature: Float = 0.5f
     private var translateLanguage: Languages = Languages.ENGLISH
 
+    private var regexUserName: String? = null
+
     @Volatile
     private var dependency: Dependency? = null
 
@@ -488,4 +490,12 @@ object QuickBloxUiKit {
     fun isEnabledReply(): Boolean {
         return enabledReply
     }
+
+    fun setRegexUserName(regex: String) {
+        regexUserName = regex
+    }
+
+    fun getRegexUserName(): String? {
+        return regexUserName
+    }
 }

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/repository/mapper/MessageMapper.kt

@@ -123,9 +123,8 @@ object MessageMapper {
     @VisibleForTesting
     fun isExistFileIn(dto: RemoteMessageDTO): Boolean {
         val isAvailableFileName = dto.fileName?.isNotEmpty() == true
-        val isAvailableFileUrl = dto.fileUrl?.isNotEmpty() == true
         val isAvailableContentType = dto.mimeType?.isNotEmpty() == true
-        return isAvailableFileName && isAvailableFileUrl && isAvailableContentType
+        return isAvailableFileName && isAvailableContentType
     }
 
     @VisibleForTesting
@@ -212,8 +211,7 @@ object MessageMapper {
         dto.senderId = entity.getSenderId()
 
         val isMediaContentType = entity.getContentType() == ChatMessageEntity.ContentTypes.MEDIA
-        val isAvailableFileUrl = entity.getMediaContent()?.getUrl()?.isNotEmpty() == true
-        if (isMediaContentType && isAvailableFileUrl) {
+        if (isMediaContentType ) {
             dto.fileName = entity.getMediaContent()?.getName()
             dto.mimeType = entity.getMediaContent()?.getMimeType()
             dto.fileUrl = entity.getMediaContent()?.getUrl()
@@ -232,11 +230,9 @@ object MessageMapper {
         dto.participantId = entity.getParticipantId()
 
         val isMediaContentType = entity.getContentType() == ChatMessageEntity.ContentTypes.MEDIA
-        val isAvailableFileUrl = entity.getMediaContent()?.getUrl()?.isNotEmpty() == true
-        if (isMediaContentType && isAvailableFileUrl) {
+        if (isMediaContentType) {
             dto.fileName = entity.getMediaContent()?.getName()
             dto.mimeType = entity.getMediaContent()?.getMimeType()
-            dto.fileUrl = entity.getMediaContent()?.getUrl()
         }
 
         if (entity.isForwardedOrReplied()) {

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/source/local/LocalDataSourceImpl.kt

@@ -34,9 +34,18 @@ class LocalDataSourceImpl : LocalDataSource {
     private val dialogs = Collections.synchronizedSet(HashSet<LocalDialogDTO>())
 
     override fun saveDialog(dto: LocalDialogDTO) {
-        if (dialogs.contains(dto)) {
-            throw exceptionFactory.makeAlreadyExist("Dialog already exist")
+        val foundDto = dialogs.find {
+            it.id == dto.id
         }
+
+        val lastMessageDateSentOfFoundDto = foundDto?.lastMessageDateSent ?: 0
+        val lastMessageDateSentOfDto = dto.lastMessageDateSent ?: 0
+
+        val isDtoRelevantThanInCache = lastMessageDateSentOfDto > lastMessageDateSentOfFoundDto
+        if (isDtoRelevantThanInCache) {
+            dialogs.remove(foundDto)
+        }
+
         val isNotAdded = !dialogs.add(dto)
         if (isNotAdded) {
             throw exceptionFactory.makeUnexpected("Dialog not saved")

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

@@ -386,7 +386,9 @@ open class RemoteDataSourceImpl : RemoteDataSource {
             val user = userId?.let {
                 QBUsers.getUser(it).perform()
             }
-            return RemoteUserDTOMapper.toDTOFrom(user)
+            val userDTO = RemoteUserDTOMapper.toDTOFrom(user)
+            userDTO.avatarUrl = loadUserAvatarUrl(userDTO.blobId)
+            return userDTO
         } catch (exception: QBResponseException) {
             throw exceptionFactory.makeBy(exception.httpStatusCode, exception.message.toString())
         } catch (exception: MappingException) {
@@ -977,8 +979,7 @@ open class RemoteDataSourceImpl : RemoteDataSource {
         val userId = getLoggedUserId()
 
         if (isSessionCreatedBySocialProvider()) {
-            val user = loadUserById(userId)
-            login = user?.login
+            login = loadUserByIdAndGetLogin(userId)
             password = QBSessionManager.getInstance().token
         } else {
             login = QBSessionManager.getInstance().sessionParameters?.userLogin
@@ -1010,6 +1011,15 @@ open class RemoteDataSourceImpl : RemoteDataSource {
         }
     }
 
+    private fun loadUserByIdAndGetLogin(userId: Int?): String? {
+        try {
+            val user = loadUserById(userId)
+            return user?.login
+        } catch (exception: RuntimeException) {
+            throw exceptionFactory.makeIncorrectData(exception.message ?: "Error")
+        }
+    }
+
     private fun isSessionCreatedBySocialProvider(): Boolean {
         val socialProvider = QBSessionManager.getInstance().sessionParameters?.socialProvider
 

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

@@ -165,10 +165,8 @@ object RemoteMessageDTOMapper {
     }
 
     private fun isAvailableAttachmentIn(dto: RemoteMessageDTO): Boolean {
-        val availableContentType = dto.mimeType?.isNotEmpty() == true
-        val availableUrl = dto.fileUrl?.isNotEmpty() == true
-// TODO: Need to add checking dto file name 
-        return availableContentType && availableUrl
+        // TODO: Need to add checking dto file name
+        return dto.mimeType?.isNotEmpty() == true
     }
 
     fun qbSystemMessageFrom(dto: RemoteMessageDTO): QBChatMessage {

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

@@ -50,7 +50,10 @@ object ForwardReplyMessageParser {
     private const val FORWARD_TYPE = "forward"
 
     fun isForwardedOrRepliedIn(qbChatMessage: QBChatMessage): Boolean {
-        return qbChatMessage.getProperty(QB_MESSAGE_ACTION_KEY) != null
+        val qbMessageActionKey = qbChatMessage.getProperty(QB_MESSAGE_ACTION_KEY)
+        val isNotNull = qbMessageActionKey != null
+        val isNotUndefined = qbMessageActionKey != "undefined"
+        return isNotUndefined && isNotNull
     }
 
     fun parseForwardRepliedTypeFrom(dto: RemoteMessageDTO): ForwardedRepliedMessageEntity.Types {

ui-kit/src/main/java/com/quickblox/android_ui_kit/domain/entity/implementation/message/EventMessageEntityImpl.kt

@@ -77,6 +77,10 @@ open class EventMessageEntityImpl : EventMessageEntity {
         loggedUserId = id
     }
 
+    override fun getReadIds(): Collection<Int>? {
+        return readIds
+    }
+
     override fun setReadIds(ids: Collection<Int>?) {
         readIds = ids
     }

ui-kit/src/main/java/com/quickblox/android_ui_kit/domain/entity/message/EventMessageEntity.kt

@@ -23,6 +23,7 @@ interface EventMessageEntity : MessageEntity {
 
     fun setLoggedUserId(id: Int?)
 
+    fun getReadIds(): Collection<Int>?
     fun setReadIds(ids: Collection<Int>?)
 
     fun setDeliveredIds(ids: Collection<Int>?)