Commit 1d5c3fcb authored by Christophe Deschamps's avatar Christophe Deschamps
Browse files

SDK 5.0+ update (for ring stream to speaker during early media)

parent 434d25a5
Pipeline #29705 passed with stage
in 3 minutes and 3 seconds
......@@ -160,7 +160,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation "org.linphone:linphone-sdk-android:4.5.0"
implementation "org.linphone:linphone-sdk-android:5.0+"
implementation "org.permissionsdispatcher:permissionsdispatcher:4.7.0"
kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.7.0"
implementation "com.google.android.material:material:1.2.1"
......
......@@ -17,6 +17,7 @@ auto_net_state_mon=1
auto_answer_replacing_calls=1
ping_with_options=0
use_cpim=1
incoming_calls_early_media=1
[sound]
#remove this property for any application that is not Linphone public version itself
......
......@@ -27,6 +27,7 @@ import org.linhome.customisation.Customisation
import org.linhome.customisation.Texts
import org.linhome.linphonecore.CoreContext
import org.linhome.linphonecore.CorePreferences
import org.linhome.linphonecore.extensions.forceSpeakerAudioRoute
import org.linhome.store.DeviceStore
import org.linphone.core.Factory
import org.linphone.core.LogCollectionState
......@@ -71,7 +72,7 @@ class LinhomeApplication : Application() {
coreContext.core.setStaticPicture(context.filesDir.absolutePath+"/nowebcamCIF.jpg")
coreContext.core.ring = context.filesDir.absolutePath+"/bell.wav"
coreContext.core.ringDuringIncomingEarlyMedia = true
coreContext.core.isNativeRingingEnabled = true
setDefaultCodecs()
}
......
......@@ -87,7 +87,7 @@ object Account {
corePreferences.loginDomain?.let { xmlRpcRequest?.addStringArg(it) }
corePreferences.passwordAlgo?.let { xmlRpcRequest?.addStringArg(it) }
xmlRpcRequest?.setListener { request ->
xmlRpcRequest?.addListener { request ->
val status = request.status
val responseValues = request.listResponse
if (request.status == XmlRpcStatus.Ok) {
......
......@@ -32,6 +32,7 @@ fun Call.extendedAcceptEarlyMedia() {
if (state == Call.State.IncomingReceived) {
val earlyMediaCallParams: CallParams? = coreContext.core.createCallParams(this)
earlyMediaCallParams?.recordFile = callLog.historyEvent().mediaFileName
earlyMediaCallParams?.enableAudio(false)
enableCamera(false)
acceptEarlyMediaWithParams(earlyMediaCallParams)
startRecording()
......@@ -42,6 +43,7 @@ fun Call.extendedAccept() {
val inCallParams: CallParams? = coreContext.core.createCallParams(this)
inCallParams?.recordFile = callLog.historyEvent().mediaFileName
enableCamera(false)
inCallParams?.enableAudio(true)
val device = DeviceStore.findDeviceByAddress(remoteAddress)
if (device != null) {
......
......@@ -69,7 +69,7 @@ class LoginLinhomeAccountFragment : CreatorAssistantFragment() {
}
val xmlRpcRequest =
xmlRpcSession?.createRequest(XmlRpcArgType.String, "check_authentication")
xmlRpcRequest?.setListener { request ->
xmlRpcRequest?.addListener { request ->
hideProgress()
if (request != null) {
if (request.stringResponse == "OK") {
......
......@@ -76,6 +76,7 @@ class RemoteUrlAccountFragment : GenericFragment() {
})
model.pushReady.observe(viewLifecycleOwner, Observer { status ->
hideProgress()
mainactivity.navController.popBackStack(R.id.navigation_devices, false)
if (status) {
DialogUtil.info("remote_configuration_success")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment