Release version 7.11.5

jeevacontus · jeevacontus · commit 1ba29f3e4e16 · 2024-02-28T15:19:35.000+05:30
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,7 +35,7 @@ android {
         targetSdkVersion 34
         compileSdk(34)
         versionCode 16
-        versionName "7.11.4"
+        versionName "7.11.5"
         multiDexEnabled true
         buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
         vectorDrawables.useSupportLibrary = true
@@ -45,6 +45,7 @@ android {
 
     buildTypes {
         debug {
+            initWith debug
             buildConfigField 'Boolean', 'IS_QA_BUILD', 'true'
             buildConfigField 'String', 'LICENSE', '"Please enter your License key"'
             buildConfigField 'String', 'WEB_CHAT_LOGIN', '"https://webchat-preprod-sandbox.mirrorfly.com/"'
@@ -201,7 +202,7 @@ dependencies {
     implementation project(':sdk:googletranslation')
     implementation project(path: ':call')
 
-    implementation 'com.mirrorfly.sdk:mirrorflysdk:7.11.4'
+    implementation 'com.mirrorfly.sdk:mirrorflysdk:7.11.5'
 
     //Socket - versions.gradle
     implementation 'com.github.nkzawa:socket.io-client:0.6.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,7 @@
         </intent>
     </queries>
 
+
     <application
         android:name=".constants.MobileApplication"
         android:allowBackup="false"
diff --git a/app/src/main/java/com/contusfly/activities/ChatActivity.kt b/app/src/main/java/com/contusfly/activities/ChatActivity.kt
@@ -2164,6 +2164,7 @@ class ChatActivity : ChatParent(), ActionMode.Callback, View.OnTouchListener, Em
     }
 
     override fun onCancelUploadClicked(messageItem: ChatMessage) {
+        LogMessage.d("FILE_UPLOAD_TAG","Cancel Uploading.......")
         if (!messageItem.isMediaUploaded() || !messageItem.isMediaDownloaded())
             handleCancelClickedOnMediaMessage(messageItem)
         else {
@@ -2189,6 +2190,7 @@ class ChatActivity : ChatParent(), ActionMode.Callback, View.OnTouchListener, Em
     }
 
     override fun onRetryClicked(item: ChatMessage?) {
+        LogMessage.d("FILE_UPLOAD_TAG","Resume Uploading.......")
         netConditionalCall({
             item?.let {
                 FlyMessenger.uploadMedia(it.messageId)
@@ -2238,6 +2240,7 @@ class ChatActivity : ChatParent(), ActionMode.Callback, View.OnTouchListener, Em
                 listChats.scrollToPosition(mainList.size - 1)
         } catch (e: java.lang.Exception) {
             LogMessage.e(e)
+            LogMessage.e("FILE_UPLOAD_TAG","Clear Chat Error $e")
         }
     }
 
diff --git a/app/src/main/java/com/contusfly/call/groupcall/CallExtention.kt b/app/src/main/java/com/contusfly/call/groupcall/CallExtention.kt
@@ -68,7 +68,7 @@ fun CallManager.getCallConnectedStatus(context: Context): String {
             CallStatus.RECONNECTING -> context.getString(R.string.reconnecting)
             else -> {
                 when (val remoteCallStatus = getCallStatus(getEndCallerJid())) {
-                    CallStatus.CALLING, CallStatus.RINGING, CallStatus.ON_HOLD -> remoteCallStatus
+                    CallStatus.CALLING, CallStatus.RINGING, CallStatus.ON_HOLD,CallStatus.RECONNECTING -> remoteCallStatus
                     else -> Constants.EMPTY_STRING
                 }
             }
diff --git a/app/src/main/java/com/contusfly/call/groupcall/GroupCallActivity.kt b/app/src/main/java/com/contusfly/call/groupcall/GroupCallActivity.kt
@@ -817,13 +817,24 @@ class GroupCallActivity : BaseActivity(), View.OnClickListener, ActivityOnClickL
             }
         }
 
+        private fun checkAndUpdateStatusForUser(userJid: String){
+            if ((CallManager.isOneToOneCall() || CallUtils.getPinnedUserJid() == userJid) && !CallUtils.getIsGridViewEnabled()) callViewHelper.updateCallStatus()
+            else callViewHelper.updateStatusAdapter(userJid)
+        }
+
         private fun handleOtherCallStatusMessages(@CallStatus callEvent: String, userJid: String) {
             when (callEvent) {
                 CallStatus.ON_RESUME -> handleCallStatusResume(userJid)
                 CallStatus.RECONNECTING, CallStatus.ON_HOLD -> {
+                    LogMessage.d(TAG, "$CALL_UI $JOIN_CALL #reconnecting  userJid:$userJid")
                     setUpCallUI()
-                    if ((CallManager.isOneToOneCall() || CallUtils.getPinnedUserJid() == userJid) && !CallUtils.getIsGridViewEnabled()) callViewHelper.updateCallStatus()
-                    else callViewHelper.updateStatusAdapter(userJid)
+                    if(callEvent.equals(CallStatus.RECONNECTING,true)){
+                        CallUtils.clearPeakSpeakingUser(userJid)
+                        onUserStoppedSpeaking(userJid)
+                        durationHandler.postDelayed({checkAndUpdateStatusForUser(userJid)},1200)
+                    }else{
+                        checkAndUpdateStatusForUser(userJid)
+                    }
                 }
 
                 CallStatus.RINGING, CallStatus.CALLING_AFTER_10S -> {
diff --git a/app/src/main/java/com/contusfly/call/groupcall/helpers/BaseCallViewHelper.kt b/app/src/main/java/com/contusfly/call/groupcall/helpers/BaseCallViewHelper.kt
@@ -1075,7 +1075,8 @@ class BaseCallViewHelper(
     }
 
     fun onUserSpeaking(userJid: String, audioLevel: Int) {
-        if (CallManager.isCallConnected()) {
+        val userStatus = GroupCallUtils.getCallStatus(userJid)
+        if (CallManager.isCallConnected() && !userStatus.equals(CallStatus.RECONNECTING,false)) {
             CallUtils.onUserSpeaking(userJid, audioLevel)
             if (activity.isInPIPMode())
                 pipViewHelper.onUserSpeaking(userJid, audioLevel)
diff --git a/app/src/main/java/com/contusfly/call/groupcall/helpers/CallConnectedViewHelper.kt b/app/src/main/java/com/contusfly/call/groupcall/helpers/CallConnectedViewHelper.kt
@@ -584,11 +584,12 @@ class CallConnectedViewHelper(
     }
 
     fun updateCallStatus() {
-        LogMessage.i(TAG, "$CALL_UI CallConnectedViewHelper updateCallStatus")
+        LogMessage.i(TAG, "$CALL_UI CallConnectedViewHelper updateCallStatus isOneToOneCall: ${CallManager.isOneToOneCall()}")
         val pinnedUser = CallUtils.getPinnedUserJid()
         val connectedStatus =
             if (CallManager.isOneToOneCall()) CallManager.getCallConnectedStatus(activity)
             else CallManager.getCallStatus(pinnedUser)
+        LogMessage.i(TAG, "$CALL_UI CallConnectedViewHelper connectedStatus:$connectedStatus")
         if (connectedStatus in arrayOf(
                 CallStatus.ON_HOLD,
                 CallStatus.RECONNECTING,
diff --git a/app/src/main/java/com/contusfly/constants/MobileApplication.kt b/app/src/main/java/com/contusfly/constants/MobileApplication.kt
@@ -229,6 +229,7 @@ class MobileApplication : Application(), HasAndroidInjector {
             }
         })
         CallManager.enableCallLogExport(true)
+        CallManager.enableDebugLogs(true)
     }
 
     private fun getMissedCallNotificationContent( isOneToOneCall: Boolean, userJid: String, groupId: String?, callType: String,
diff --git a/app/src/main/java/com/contusfly/utils/MediaPermissions.kt b/app/src/main/java/com/contusfly/utils/MediaPermissions.kt
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/build.gradle b/build.gradle
diff --git a/local.properties b/local.properties

Original file line number	Diff line number	Diff line change
`@@ -2164,6 +2164,7 @@ class ChatActivity : ChatParent(), ActionMode.Callback, View.OnTouchListener, Em`
`2164`	`2164`	`}`
`2165`	`2165`
`2166`	`2166`	`override fun onCancelUploadClicked(messageItem: ChatMessage) {`
	`2167`	`+ LogMessage.d("FILE_UPLOAD_TAG","Cancel Uploading.......")`
`2167`	`2168`	`if (!messageItem.isMediaUploaded() \|\| !messageItem.isMediaDownloaded())`
`2168`	`2169`	`handleCancelClickedOnMediaMessage(messageItem)`
`2169`	`2170`	`else {`
`@@ -2189,6 +2190,7 @@ class ChatActivity : ChatParent(), ActionMode.Callback, View.OnTouchListener, Em`
`2189`	`2190`	`}`
`2190`	`2191`
`2191`	`2192`	`override fun onRetryClicked(item: ChatMessage?) {`
	`2193`	`+ LogMessage.d("FILE_UPLOAD_TAG","Resume Uploading.......")`
`2192`	`2194`	`netConditionalCall({`
`2193`	`2195`	`item?.let {`
`2194`	`2196`	`FlyMessenger.uploadMedia(it.messageId)`
`@@ -2238,6 +2240,7 @@ class ChatActivity : ChatParent(), ActionMode.Callback, View.OnTouchListener, Em`
`2238`	`2240`	`listChats.scrollToPosition(mainList.size - 1)`
`2239`	`2241`	`} catch (e: java.lang.Exception) {`
`2240`	`2242`	`LogMessage.e(e)`
	`2243`	`+ LogMessage.e("FILE_UPLOAD_TAG","Clear Chat Error $e")`
`2241`	`2244`	`}`
`2242`	`2245`	`}`
`2243`	`2246`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ fun CallManager.getCallConnectedStatus(context: Context): String {`
`68`	`68`	`CallStatus.RECONNECTING -> context.getString(R.string.reconnecting)`
`69`	`69`	`else -> {`
`70`	`70`	`when (val remoteCallStatus = getCallStatus(getEndCallerJid())) {`
`71`		`- CallStatus.CALLING, CallStatus.RINGING, CallStatus.ON_HOLD -> remoteCallStatus`
	`71`	`+ CallStatus.CALLING, CallStatus.RINGING, CallStatus.ON_HOLD,CallStatus.RECONNECTING -> remoteCallStatus`
`72`	`72`	`else -> Constants.EMPTY_STRING`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1075,7 +1075,8 @@ class BaseCallViewHelper(`
`1075`	`1075`	`}`
`1076`	`1076`
`1077`	`1077`	`fun onUserSpeaking(userJid: String, audioLevel: Int) {`
`1078`		`- if (CallManager.isCallConnected()) {`
	`1078`	`+ val userStatus = GroupCallUtils.getCallStatus(userJid)`
	`1079`	`+ if (CallManager.isCallConnected() && !userStatus.equals(CallStatus.RECONNECTING,false)) {`
`1079`	`1080`	`CallUtils.onUserSpeaking(userJid, audioLevel)`
`1080`	`1081`	`if (activity.isInPIPMode())`
`1081`	`1082`	`pipViewHelper.onUserSpeaking(userJid, audioLevel)`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ class MobileApplication : Application(), HasAndroidInjector {`
`229`	`229`	`}`
`230`	`230`	`})`
`231`	`231`	`CallManager.enableCallLogExport(true)`
	`232`	`+ CallManager.enableDebugLogs(true)`
`232`	`233`	`}`
`233`	`234`
`234`	`235`	`private fun getMissedCallNotificationContent( isOneToOneCall: Boolean, userJid: String, groupId: String?, callType: String,`