Skip to content

Commit 58e3f17

Browse files
committed
Merge branch 'master' of https://github.com/MirrorFly/MirrorFly-Android-Sample-V2 into release/V7.12.4
# Conflicts: # .idea/workspace.xml
2 parents fdb461f + 083da6c commit 58e3f17

File tree

81 files changed

+2231
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2231
-566
lines changed

.gitignore

Lines changed: 0 additions & 60 deletions
This file was deleted.

.idea/workspace.xml

Lines changed: 0 additions & 265 deletions
This file was deleted.

app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

app/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ android {
3232

3333
defaultConfig {
3434
minSdkVersion 21
35-
targetSdkVersion 33
36-
compileSdk(33)
35+
targetSdkVersion 34
36+
compileSdk(34)
3737
versionCode 16
38-
versionName "7.10.0"
38+
versionName "7.12.0"
3939
multiDexEnabled true
4040
buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
4141
vectorDrawables.useSupportLibrary = true
@@ -45,7 +45,6 @@ android {
4545

4646
buildTypes {
4747
debug {
48-
initWith debug
4948
buildConfigField 'Boolean', 'IS_QA_BUILD', 'true'
5049
buildConfigField 'String', 'LICENSE', '"Please enter your License key"'
5150
buildConfigField 'String', 'WEB_CHAT_LOGIN', '"https://webchat-preprod-sandbox.mirrorfly.com/"'
@@ -112,7 +111,7 @@ dependencies {
112111
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
113112
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
114113
testImplementation 'junit:junit:4.13.2'
115-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
114+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
116115
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
117116
implementation "androidx.core:core-ktx:1.3.2"
118117
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -203,7 +202,7 @@ dependencies {
203202
implementation project(':sdk:googletranslation')
204203
implementation project(path: ':call')
205204

206-
implementation 'com.mirrorfly.sdk:mirrorflysdk:7.10.0'
205+
implementation 'com.mirrorfly.sdk:mirrorflysdk:7.12.0'
207206

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

app/src/main/AndroidManifest.xml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@
4343

4444
<uses-feature android:name="android.hardware.camera" />
4545

46+
<!--Android 14 permission changes -->
47+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA"/>
48+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
49+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
50+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
51+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING"/>
52+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
53+
54+
<uses-permission android:name="android.permission.TURN_SCREEN_ON"/>
55+
4656
<queries>
4757
<intent>
4858
<action android:name="android.intent.action.VIEW" />
@@ -58,6 +68,7 @@
5868
</intent>
5969
</queries>
6070

71+
6172
<application
6273
android:name=".constants.MobileApplication"
6374
android:allowBackup="false"
@@ -70,6 +81,11 @@
7081
android:theme="@style/MyTheme"
7182
android:usesCleartextTraffic="true"
7283
tools:replace="android:label,android:allowBackup">
84+
<activity
85+
android:name=".activities.EditMessageActivity"
86+
android:exported="false"
87+
android:theme="@style/TransparentTheme"
88+
android:windowSoftInputMode="adjustResize" />
7389
<activity
7490
android:name=".privateChat.PrivateChatListActivity"
7591
android:exported="false" />
@@ -243,6 +259,7 @@
243259
-->
244260
<activity
245261
android:name=".call.groupcall.GroupCallActivity"
262+
android:exported="false"
246263
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
247264
android:excludeFromRecents="true"
248265
android:launchMode="singleTask"
@@ -255,7 +272,7 @@
255272
android:taskAffinity="call.video"
256273
android:turnScreenOn="true"
257274
android:windowSoftInputMode="stateHidden"
258-
tools:targetApi="R" />
275+
tools:targetApi="R"/>
259276
<activity
260277
android:name=".call.calllog.CallHistoryDetailActivity"
261278
android:screenOrientation="portrait" /> <!-- <activity -->
@@ -295,9 +312,9 @@
295312
android:screenOrientation="portrait" />
296313
<activity
297314
android:name=".call.groupcall.OnGoingCallPreviewActivity"
298-
android:windowSoftInputMode="stateAlwaysHidden"
299315
android:exported="false"
300-
android:screenOrientation="portrait" />
316+
android:screenOrientation="portrait"
317+
android:windowSoftInputMode="stateAlwaysHidden" />
301318
<activity
302319
android:name=".activities.UserListActivity"
303320
android:exported="false"

app/src/main/java/com/contusfly/MyFirebaseMessagingService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
3333
val notificationData: Map<String, String> = remoteMessage.data
3434
if (notificationData.isNotEmpty()) {
3535
LogMessage.d(TAG, "RemoteMessage:$notificationData")
36-
CallLogger().callLog(TAG,"RemoteMessage notification:$notificationData")
36+
CallLogger.callLog(TAG,"RemoteMessage notification:$notificationData")
3737
firebaseUtils.handleReceivedMessage(this, notificationData)
3838
}
3939
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import com.mirrorflysdk.api.contacts.ContactManager
4343
import com.mirrorflysdk.api.contacts.ProfileDetails
4444
import com.mirrorflysdk.api.models.ChatMessage
4545
import com.mirrorflysdk.flycommons.Result
46+
import com.mirrorflysdk.flycommons.exception.FlyException
4647
import com.mirrorflysdk.utils.Utils
4748
import kotlinx.coroutines.CoroutineExceptionHandler
4849
import kotlinx.coroutines.GlobalScope
@@ -82,7 +83,7 @@ open class BaseActivity : FlyBaseActivity() {
8283
AppNotificationManager.cancelNotifications(this)
8384
if (checkIsUserInCall()) {
8485
CallManager.disconnectCall(object : CallActionListener {
85-
override fun onResponse(isSuccess: Boolean, message: String) {
86+
override fun onResponse(isSuccess: Boolean, flyException: FlyException?) {
8687
startShowStopperActivity()
8788
}
8889
})
@@ -346,7 +347,7 @@ open class BaseActivity : FlyBaseActivity() {
346347
otherUserHandler?.postDelayed({
347348
if (CallManager.getGroupID() == jid && adminBlockedOtherUserStatus && checkIsUserInCall()) {
348349
CallManager.disconnectCall(object : CallActionListener {
349-
override fun onResponse(isSuccess: Boolean, message: String) {
350+
override fun onResponse(isSuccess: Boolean, flyException: FlyException?) {
350351
startDashboardActivity()
351352
}
352353
})

0 commit comments

Comments
 (0)