Skip to content

Commit 3320992

Browse files
SDK new version V7.11.6 updated
1 parent d5c0507 commit 3320992

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535
targetSdkVersion 34
3636
compileSdk(34)
3737
versionCode 16
38-
versionName "7.11.5"
38+
versionName "7.11.6"
3939
multiDexEnabled true
4040
buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
4141
vectorDrawables.useSupportLibrary = true
@@ -202,7 +202,7 @@ dependencies {
202202
implementation project(':sdk:googletranslation')
203203
implementation project(path: ':call')
204204

205-
implementation 'com.mirrorfly.sdk:mirrorflysdk:7.11.5'
205+
implementation 'com.mirrorfly.sdk:mirrorflysdk:7.11.6'
206206

207207
//Socket - versions.gradle
208208
implementation 'com.github.nkzawa:socket.io-client:0.6.0'

app/src/main/java/com/contusfly/activities/ChatActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import com.mirrorflysdk.views.CustomToast
7272
import com.google.firebase.analytics.FirebaseAnalytics
7373
import com.jakewharton.rxbinding3.recyclerview.scrollEvents
7474
import com.mirrorflysdk.api.contacts.ProfileDetails
75+
7576
import dagger.android.AndroidInjection
7677
import io.github.rockerhieu.emojicon.EmojiconGridFragment
7778
import io.github.rockerhieu.emojicon.EmojiconsFragment

app/src/main/java/com/contusfly/activities/parent/ChatParent.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,16 +1832,9 @@ open class ChatParent : BaseActivity(), CoroutineScope, MessageListener,
18321832
onMessageEdited(message)
18331833
return
18341834
}
1835-
if(isLoadNextAvailable) {
1836-
messageId = Constants.EMPTY_STRING
1837-
parentViewModel.loadInitialMessages(messageId)
1838-
} else {
1839-
if (parentViewModel.isLoadNextAvailable()) {
1840-
if (!parentViewModel.getFetchingIsInProgress())
1841-
parentViewModel.loadNextData()
1842-
} else {
1843-
parentViewModel.addSentMessage(message) //If Sent message time is less than last received message time then it will add to the message list and shown in UI
1844-
}
1835+
LogMessage.d(TAG,"#chat #sendMessageSuccess load message available-->"+parentViewModel.isLoadNextAvailable())
1836+
if(parentViewModel.isLoadNextAvailable()){
1837+
parentViewModel.loadNextData()
18451838
}
18461839
handleUnreadMessageSeparator(true)
18471840
Handler(Looper.getMainLooper()).postDelayed({

app/src/main/java/com/contusfly/viewmodels/ChatParentViewModel.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ constructor(private val messageRepository: MessageRepository) : ViewModel() {
371371
}
372372

373373
viewModelScope.launch {
374-
messageListQuery.loadLocalMessages { isSuccess, _, data ->
374+
messageListQuery.loadMessages { isSuccess, _, data ->
375375
if (isSuccess) {
376376
LogMessage.d("TAG","#chat loadInitialMessages loadLocalMessages isSuccess loadFromMessageId:$loadFromMessageId")
377377

@@ -402,6 +402,7 @@ constructor(private val messageRepository: MessageRepository) : ViewModel() {
402402
if (isSuccess) {
403403
LogMessage.d("TAG","#chat #fetchmsg loadNextMessages isSuccess")
404404
val messageList = data.getData() as ArrayList<ChatMessage>
405+
LogMessage.d(TAG,"#chat #fetchmsg loadNextMessage message size-->"+messageList.size)
405406
if (messageList.isNotEmpty()) {
406407
messageList.forEach {
407408
LogMessage.d("TAG","#chat #fetchmsg loadNextMessages messageSentTime: ${it.messageSentTime} messageTextContent: ${it.messageTextContent}")
@@ -475,7 +476,7 @@ constructor(private val messageRepository: MessageRepository) : ViewModel() {
475476
}
476477

477478
viewModelScope.launch {
478-
messageListQuery.loadLocalPreviousMessages { isSuccess, _, data ->
479+
messageListQuery.loadPreviousMessages { isSuccess, _, data ->
479480
if (isSuccess) {
480481
val messageList = data.getData() as ArrayList<ChatMessage>
481482
if (messageList.isNotEmpty()) {
@@ -512,13 +513,15 @@ constructor(private val messageRepository: MessageRepository) : ViewModel() {
512513
}
513514

514515
viewModelScope.launch {
515-
messageListQuery.loadLocalNextMessages { isSuccess, _, data ->
516+
messageListQuery.loadNextMessages { isSuccess, _, data ->
516517
if (isSuccess) {
517518

518519
LogMessage.d("TAG","#chat #fetchmsg loadLocalNextMessages ")
519520

520521
val messageList = data.getData() as ArrayList<ChatMessage>
521522

523+
LogMessage.d(TAG,"#chat #fetchmsg loadnextdata size--->"+messageList.size)
524+
522525
if (messageList.isNotEmpty()) {
523526
var skipFirstMessage = false
524527
if (paginationMessageList.isNotEmpty()) {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ ext {
4343
minSdkVersion = 21
4444
versionCode = 6
4545
versionName = "2.2"
46-
repoVersion = '7.11.5'
46+
repoVersion = '7.11.6'
4747
uatVersion = '_pre_1'
4848
}

0 commit comments

Comments
 (0)