Set media encryption to SRTP when connecting a sip.linphone.org account if media encryption setting is set to None + bumped version code

This commit is contained in:
Sylvain Berfini 2022-09-29 11:15:43 +02:00
parent 37f5721668
commit 04ae18c1ae
2 changed files with 7 additions and 12 deletions

View file

@ -6,9 +6,8 @@ plugins {
} }
def appVersionName = "4.7.0" def appVersionName = "4.7.0"
// Uncomment for 4.7.0 release // def appVersionCode = 40700
// def appVersionCode = 40700 // 4.07.00 def appVersionCode = 40700
def appVersionCode = 40694 // 4.06.94
static def getPackageName() { static def getPackageName() {
return "org.linphone" return "org.linphone"
@ -191,14 +190,6 @@ android {
dataBinding = true dataBinding = true
} }
compileOptions {
//sourceCompatibility JavaVersion.VERSION_1_8
//targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
//jvmTarget = "1.8"
}
namespace 'org.linphone' namespace 'org.linphone'
} }
@ -219,7 +210,7 @@ dependencies {
implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0" implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.gridlayout:gridlayout:1.0.0" implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation 'androidx.recyclerview:recyclerview:1.3.0-beta02' implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
// https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0 // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.6.1'

View file

@ -508,6 +508,10 @@ class CoreContext(
friendList.rlsAddress = rlsAddress friendList.rlsAddress = rlsAddress
} }
} }
if (core.mediaEncryption == MediaEncryption.None) {
Log.i("[Context] Enabling SRTP media encryption instead of None")
core.mediaEncryption = MediaEncryption.SRTP
}
} else { } else {
Log.i("[Context] Background mode with foreground service automatically enabled") Log.i("[Context] Background mode with foreground service automatically enabled")
corePreferences.keepServiceAlive = true corePreferences.keepServiceAlive = true