mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply workaround when making a call to a SIP URI having a phone number as username & IP as domain

Browse source
This commit is contained in:
Sylvain Berfini 2025-04-17 14:30:23 +02:00
parent 5ef7eab0c5
commit dcbc837106
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
View file

@ -20,6 +20,7 @@
package org.linphone.compatibility
import android.content.Intent
import android.net.InetAddresses.isNumericAddress
import android.net.Uri
import android.os.Build
import android.provider.MediaStore
@ -62,5 +63,9 @@ class Api29Compatibility {
session.contentCaptureContext = ContentCaptureContext.forLocusId(conversationId)
}
}
fun isIpAddress(string: String): Boolean {
return isNumericAddress(string)
}
}
}

8
app/src/main/java/org/linphone/compatibility/Compatibility.kt
View file

@ -28,6 +28,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Environment
import android.util.Patterns
import android.view.View
import androidx.appcompat.app.AppCompatDelegate
import org.linphone.core.tools.Log
@ -186,5 +187,12 @@ class Compatibility {
Api35Compatibility.setupAppStartupListener(context)
}
}
fun isIpAddress(string: String): Boolean {
if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
return Api29Compatibility.isIpAddress(string)
}
return Patterns.IP_ADDRESS.matcher(string).matches()
}
}
}

29
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -34,12 +34,14 @@ import android.provider.Settings.SettingNotFoundException
import androidx.annotation.AnyThread
import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.core.text.isDigitsOnly
import androidx.lifecycle.MutableLiveData
import com.google.firebase.crashlytics.FirebaseCrashlytics
import kotlin.system.exitProcess
import org.linphone.BuildConfig
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.compatibility.Compatibility
import org.linphone.contacts.ContactsManager
import org.linphone.core.tools.Log
import org.linphone.notifications.NotificationsManager
@ -837,10 +839,6 @@ class CoreContext
if (forceZRTP) {
params.mediaEncryption = MediaEncryption.ZRTP
}
/*if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) {
Log.w("$TAG Enabling low bandwidth mode!")
params.isLowBandwidthEnabled = true
}*/
params.recordFile = LinphoneUtils.getRecordingFilePathForAddress(address)
@ -860,8 +858,27 @@ class CoreContext
}
}
val call = core.inviteAddressWithParams(address, params)
Log.i("$TAG Starting call $call")
val username = address.username.orEmpty()
val domain = address.domain.orEmpty()
val defaultAccount = params.account ?: core.defaultAccount
if (defaultAccount != null && Compatibility.isIpAddress(domain)) {
Log.i("$TAG SIP URI [${address.asStringUriOnly()}] seems to have an IP address as domain")
if (username.isNotEmpty() && (username.startsWith("+") || username.isDigitsOnly())) {
val identityDomain = defaultAccount.params.identityAddress?.domain
Log.w("$TAG Username [$username] looks like a phone number, replacing domain [$domain] by the local account one [$identityDomain]")
if (identityDomain != null) {
val newAddress = address.clone()
newAddress.domain = identityDomain
core.inviteAddressWithParams(newAddress, params)
Log.i("$TAG Starting call to [${newAddress.asStringUriOnly()}]")
return
}
}
}
core.inviteAddressWithParams(address, params)
Log.i("$TAG Starting call to [${address.asStringUriOnly()}]")
}
@WorkerThread