Skip to content

Commit 3ea45d0

Browse files
VanithacontusVanithacontus
authored
Merge pull request #42 from MirrorFly/release/v7.13.16
new SDK version updated to 7.13.16
2 parents 8263f43 + c1fd8c9 commit 3ea45d0

File tree

11 files changed

+85
-63
lines changed

11 files changed

+85
-63
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ dependencies {
199199
implementation project(':sdk:googletranslation')
200200
implementation project(path: ':call')
201201

202-
implementation 'com.mirrorfly.sdk:mirrorflysdk:7.13.13'
202+
implementation 'com.mirrorfly.sdk:mirrorflysdk:7.13.16'
203203

204204
//Socket - versions.gradle
205205
implementation 'com.github.nkzawa:socket.io-client:0.6.0'
@@ -225,8 +225,8 @@ dependencies {
225225
//okhttp interceptor
226226
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
227227
//QR Code Scanner
228-
implementation 'com.journeyapps:zxing-android-embedded:3.6.0@aar'
229-
implementation 'com.google.zxing:core:3.3.2'
228+
implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
229+
implementation 'com.google.zxing:core:3.4.1'
230230
//shortcut badger
231231
implementation "me.leolin:ShortcutBadger:1.1.22@aar"
232232

‎app/src/main/java/com/contusfly/activities/ArchivedChatsActivity.kt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -896,11 +896,16 @@ class ArchivedChatsActivity : BaseActivity(), ActionMode.Callback,
896896
}
897897
}
898898

899-
override fun onMuteStatusUpdated(isSuccess: Boolean,message: String,jidList: List<String>) {
900-
super.onMuteStatusUpdated(isSuccess,message,jidList)
899+
override fun onMuteStatusUpdated(
900+
isSuccess: Boolean,
901+
message: String,
902+
jidList: List<String>,
903+
muteStatus: Boolean
904+
) {
905+
super.onMuteStatusUpdated(isSuccess, message, jidList, muteStatus)
901906
LogMessage.d("DashboardActivity", "#mute #recentChat update")
902907
viewModel.archiveANDPrivateChatmuteChatStatusUpdate(jidList)
903-
if(viewModel.selectedChats.size > 0) {
908+
if (viewModel.selectedChats.size > 0) {
904909
viewModel.muteChatStatusUpdateSelectedPrivateAndArchiveChat(jidList)
905910
}
906911
}

‎app/src/main/java/com/contusfly/activities/BaseActivity.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,13 @@ open class BaseActivity : FlyBaseActivity() {
536536
getUserMuteNotificationStatus()
537537
}
538538

539-
override fun onMuteStatusUpdated(isSuccess: Boolean,message: String,jidList: List<String>) {
540-
super.onMuteStatusUpdated(isSuccess,message,jidList)
539+
override fun onMuteStatusUpdated(
540+
isSuccess: Boolean,
541+
message: String,
542+
jidList: List<String>,
543+
muteStatus: Boolean
544+
) {
545+
super.onMuteStatusUpdated(isSuccess, message, jidList, muteStatus)
541546
LogMessage.d(TAG, "#mute #recentChat update")
542547
}
543548

‎app/src/main/java/com/contusfly/activities/DashboardActivity.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -898,11 +898,16 @@ class DashboardActivity : DashboardParent(), View.OnClickListener, ActionMode.Ca
898898
callLogviewModel.uploadUnSyncedCallLogs()
899899
}
900900

901-
override fun onMuteStatusUpdated(isSuccess: Boolean,message: String,jidList: List<String>) {
902-
super.onMuteStatusUpdated(isSuccess,message,jidList)
903-
LogMessage.d("DashboardActivity", "#mute #recentChat update")
901+
override fun onMuteStatusUpdated(
902+
isSuccess: Boolean,
903+
message: String,
904+
jidList: List<String>,
905+
muteStatus: Boolean
906+
) {
907+
super.onMuteStatusUpdated(isSuccess, message, jidList, muteStatus)
908+
LogMessage.d("DashboardActivity", "#mute #recentChat update--$muteStatus")
904909
viewModel.muteChatStatusUpdate(jidList)
905-
if(viewModel.selectedRecentChats.size > 0) {
910+
if (viewModel.selectedRecentChats.size > 0) {
906911
viewModel.muteChatStatusUpdateSelectedRecentChat(jidList)
907912
}
908913
}

‎app/src/main/java/com/contusfly/activities/GroupInfoActivity.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,8 +1600,13 @@ class GroupInfoActivity : BaseActivity(),CommonAlertDialog.CommonDialogClosedLis
16001600
}
16011601
}
16021602

1603-
override fun onMuteStatusUpdated(isSuccess: Boolean,message: String,jidList: List<String>) {
1604-
super.onMuteStatusUpdated(isSuccess,message,jidList)
1603+
override fun onMuteStatusUpdated(
1604+
isSuccess: Boolean,
1605+
message: String,
1606+
jidList: List<String>,
1607+
muteStatus: Boolean
1608+
) {
1609+
super.onMuteStatusUpdated(isSuccess, message, jidList, muteStatus)
16051610
com.contusfly.utils.LogMessage.d("DashboardActivity", "#mute #recentChat update")
16061611
muteChatStatusUpdate(jidList)
16071612
}

‎app/src/main/java/com/contusfly/activities/QrCodeScannerActivity.kt‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.contusfly.databinding.ActivityQrCodeScannerBinding
1111
import com.contusfly.getMessage
1212
import com.contusfly.utils.LogMessage
1313
import com.contusfly.utils.UserInterfaceUtils.Companion.setUpToolBar
14-
import com.mirrorflysdk.AppUtils
14+
import com.google.zxing.BarcodeFormat
1515
import com.mirrorflysdk.api.FlyCore
1616
import com.mirrorflysdk.utils.UpDateWebPassword
1717
import com.mirrorflysdk.views.CustomToast
@@ -25,11 +25,6 @@ class QrCodeScannerActivity : BaseActivity(), BarcodeCallback {
2525

2626
private lateinit var qrCodeScannerBinding: ActivityQrCodeScannerBinding
2727

28-
/**
29-
* The reference of the UpdatedWebPassword helper object.
30-
*/
31-
private var updateWebPassword: UpDateWebPassword? = null
32-
3328
/**
3429
* The view reference of the BarcodeView object.
3530
*/
@@ -40,8 +35,6 @@ class QrCodeScannerActivity : BaseActivity(), BarcodeCallback {
4035
qrCodeScannerBinding = ActivityQrCodeScannerBinding.inflate(layoutInflater)
4136
setContentView(qrCodeScannerBinding.root)
4237

43-
updateWebPassword = UpDateWebPassword()
44-
4538
val toolbar: Toolbar = qrCodeScannerBinding.toolbar
4639
setSupportActionBar(toolbar)
4740
setUpToolBar(this, toolbar, supportActionBar, resources.getString(R.string.scan_code))
@@ -50,30 +43,34 @@ class QrCodeScannerActivity : BaseActivity(), BarcodeCallback {
5043
tvWebLoginUrl.text = "Visit " + BuildConfig.WEB_CHAT_LOGIN.toString() + " on your computer and scan the QR code"
5144
val intent = Intent()
5245
intent.putExtra(Intents.Scan.PROMPT_MESSAGE, "")
46+
intent.putExtra(Intents.Scan.FORMATS, BarcodeFormat.QR_CODE.toString()) // Restrict to QR codes
5347
barcodeView!!.initializeFromIntent(intent)
5448
barcodeView!!.decodeSingle(this)
5549
}
5650

57-
override fun barcodeResult(result: BarcodeResult?) {
58-
LogMessage.e("#qrlogin","Scanned Successfully")
59-
FlyCore.loginWebChatViaQRCode(result!!.result.text) { isSuccess, _, data ->
51+
private fun qrCodeLogin(qrText: String) {
52+
FlyCore.loginWebChatViaQRCode(qrText) { isSuccess, throwable, data ->
6053
if (isSuccess) {
6154
val vibrator = getSystemService(VIBRATOR_SERVICE) as Vibrator
6255
if (vibrator.hasVibrator()) {
6356
vibrator.vibrate(50)
6457
}
6558
finish()
6659
} else {
67-
if (AppUtils.isNetConnected(this)) {
68-
CustomToast.show(this, getString(R.string.error_occurred_label))
69-
}else{
70-
CustomToast.show(this, data.getMessage())
60+
val errorMessage = data.getMessage().ifEmpty {
61+
throwable?.localizedMessage ?: getString(R.string.error_occurred_label)
7162
}
63+
CustomToast.show(this, errorMessage)
7264
finish()
7365
}
7466
}
7567
}
7668

69+
override fun barcodeResult(result: BarcodeResult?) {
70+
LogMessage.d("#qrlogin","Scanned Successfully")
71+
qrCodeLogin(result!!.result.text)
72+
}
73+
7774
override fun possibleResultPoints(resultPoints: MutableList<ResultPoint>?) {
7875
//Do nthg
7976
}

‎app/src/main/java/com/contusfly/activities/QrResultActivity.kt‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
package com.contusfly.activities
22

3-
import android.content.BroadcastReceiver
4-
import android.content.Context
53
import android.content.Intent
6-
import android.content.IntentFilter
74
import android.os.Bundle
85
import android.view.View
96
import android.widget.Button
107
import android.widget.ImageView
118
import android.widget.TextView
12-
import androidx.localbroadcastmanager.content.LocalBroadcastManager
139
import androidx.recyclerview.widget.LinearLayoutManager
1410
import androidx.recyclerview.widget.RecyclerView
1511
import com.contusfly.BuildConfig
1612
import com.contusfly.R
1713
import com.contusfly.adapters.WebLoginAdapter
14+
import com.contusfly.checkInternetAndExecute
1815
import com.contusfly.databinding.ActivityQrResultBinding
16+
import com.contusfly.getMessage
1917
import com.contusfly.views.CommonAlertDialog
2018
import com.contusfly.views.CommonAlertDialog.CommonDialogClosedListener
2119
import com.mirrorflysdk.AppUtils
22-
import com.mirrorflysdk.api.ChatManager
2320
import com.mirrorflysdk.api.WebLoginDataManager
2421
import com.mirrorflysdk.flydatabase.model.WebLogin
2522
import com.mirrorflysdk.utils.UpDateWebPassword
2623
import com.mirrorflysdk.views.CustomToast
27-
import java.util.*
2824

2925
class QrResultActivity : BaseActivity(), View.OnClickListener, CommonDialogClosedListener {
3026

@@ -75,15 +71,6 @@ class QrResultActivity : BaseActivity(), View.OnClickListener, CommonDialogClose
7571
*/
7672
var txtWebUrl: TextView? = null
7773

78-
/**
79-
* Recives broadcast when the user logout from WEB CHAT.
80-
*/
81-
private val webLogReceiver: BroadcastReceiver = object : BroadcastReceiver() {
82-
override fun onReceive(context: Context, intent: Intent) {
83-
loadAdapter()
84-
}
85-
}
86-
8774
override fun onCreate(savedInstanceState: Bundle?) {
8875
super.onCreate(savedInstanceState)
8976
qrResultBinding = ActivityQrResultBinding.inflate(layoutInflater)
@@ -99,8 +86,6 @@ class QrResultActivity : BaseActivity(), View.OnClickListener, CommonDialogClose
9986
imageViewAddButton!!.setOnClickListener(this)
10087
imageViewBackButton!!.setOnClickListener(this)
10188
btnLogOutAll!!.setOnClickListener(this)
102-
103-
LocalBroadcastManager.getInstance(context!!).registerReceiver(webLogReceiver, IntentFilter("Update_webPage"))
10489
loadAdapter()
10590
}
10691

@@ -120,8 +105,9 @@ class QrResultActivity : BaseActivity(), View.OnClickListener, CommonDialogClose
120105
override fun onClick(v: View) {
121106
when (v.id) {
122107
R.id.button_add -> {
123-
WebLoginDataManager.webLoginDetailsCleared()
124-
startActivity(Intent(applicationContext, QrCodeScannerActivity::class.java))
108+
checkInternetAndExecute {
109+
startActivity(Intent(applicationContext, QrCodeScannerActivity::class.java))
110+
}
125111
finish()
126112
}
127113
R.id.btn_logout_all_webchat -> logoutAllWeb()
@@ -159,10 +145,17 @@ class QrResultActivity : BaseActivity(), View.OnClickListener, CommonDialogClose
159145
finish()
160146
}
161147

148+
/**
149+
* Override method will be called when Qr code loggedIn web will be logged out.
150+
* Based on the SocketId, remove the web login from the list.
151+
*/
152+
override fun onLogoutWeb(socketId: List<String>?) {
153+
super.onLogoutWeb(socketId)
154+
loadAdapter()
155+
}
156+
162157
override fun onDialogClosed(dialogType: CommonAlertDialog.DIALOGTYPE?, isSuccess: Boolean) {
163158
if (isSuccess) {
164-
WebLoginDataManager.webLoginDetailsCleared()
165-
mUpDateWebPassword!!.upDatePassword()
166159
logoutWebUser()
167160
}
168161
}
@@ -172,10 +165,9 @@ class QrResultActivity : BaseActivity(), View.OnClickListener, CommonDialogClose
172165
*/
173166
private fun logoutWebUser() {
174167
if (AppUtils.isNetConnected(this)) {
175-
if (listWebLogin!!.isNotEmpty()) {
176-
for (i in listWebLogin!!.indices) {
177-
ChatManager.logoutWebUser(listWebLogin!![i].qrUniqeToken)
178-
}
168+
WebLoginDataManager.logOutWebSessions { _, _, data ->
169+
CustomToast.show(this, data.getMessage())
170+
finish()
179171
}
180172
} else CustomToast.show(this, getString(R.string.msg_no_internet))
181173
}

‎app/src/main/java/com/contusfly/activities/UserInfoActivity.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,13 @@ class UserInfoActivity : BaseActivity(), CommonAlertDialog.CommonDialogClosedLis
478478
}
479479
}
480480

481-
override fun onMuteStatusUpdated(isSuccess: Boolean,message: String,jidList: List<String>) {
482-
super.onMuteStatusUpdated(isSuccess,message,jidList)
481+
override fun onMuteStatusUpdated(
482+
isSuccess: Boolean,
483+
message: String,
484+
jidList: List<String>,
485+
muteStatus: Boolean
486+
) {
487+
super.onMuteStatusUpdated(isSuccess, message, jidList, muteStatus)
483488
LogMessage.d("DashboardActivity", "#mute #recentChat update")
484489
LogMessage.d(MUTE_STATUS,"onMuteStatusUpdated received from server isSuccess: $isSuccess message : $message")
485490
muteChatStatusUpdate(jidList)

‎app/src/main/java/com/contusfly/activities/parent/DashboardParent.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ open class DashboardParent : BaseActivity(), CoroutineScope {
114114
ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
115115

116116
if(!permissions.containsValue(false)) {
117-
startActivity(Intent(this, QrCodeScannerActivity::class.java))
117+
checkInternetAndExecute {
118+
startActivity(Intent(this, QrCodeScannerActivity::class.java))
119+
}
118120
}
119121
}
120122

@@ -634,7 +636,9 @@ open class DashboardParent : BaseActivity(), CoroutineScope {
634636
checkLogin()
635637
if (!SharedPreferenceManager.getBoolean(Constants.IS_WEBCHAT_LOGGED_IN)) {
636638
if (MediaPermissions.isPermissionAllowed(this, Manifest.permission.CAMERA))
637-
startActivity(Intent(this, QrCodeScannerActivity::class.java))
639+
checkInternetAndExecute {
640+
startActivity(Intent(this, QrCodeScannerActivity::class.java))
641+
}
638642
else
639643
MediaPermissions.requestCameraPermission(this, permissionAlertDialog, cameraPermissionLauncher)
640644
} else

‎app/src/main/java/com/contusfly/privateChat/PrivateChatListActivity.kt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -905,11 +905,16 @@ CommonAlertDialog.CommonDialogClosedListener {
905905
finish()
906906
}
907907
}
908-
override fun onMuteStatusUpdated(isSuccess: Boolean,message: String,jidList: List<String>) {
909-
super.onMuteStatusUpdated(isSuccess,message,jidList)
908+
override fun onMuteStatusUpdated(
909+
isSuccess: Boolean,
910+
message: String,
911+
jidList: List<String>,
912+
muteStatus: Boolean
913+
) {
914+
super.onMuteStatusUpdated(isSuccess, message, jidList, muteStatus)
910915
LogMessage.d("DashboardActivity", "#mute #recentChat update")
911916
viewModel.archiveANDPrivateChatmuteChatStatusUpdate(jidList)
912-
if(viewModel.selectedChats.size > 0) {
917+
if (viewModel.selectedChats.size > 0) {
913918
viewModel.muteChatStatusUpdateSelectedPrivateAndArchiveChat(jidList)
914919
}
915920
}

0 commit comments

Comments
 (0)