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

Removed cellular/wifi signal alerts

Browse source
This commit is contained in:
Sylvain Berfini 2024-01-19 14:05:39 +01:00
parent 3e845f45f7
commit d232fa0d14
2 changed files with 0 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/org/linphone/ui/call/CallActivity.kt
View file

@ -138,46 +138,6 @@ class CallActivity : GenericActivity() {
}
}
callViewModel.showLowWifiSignalEvent.observe(this) {
it.consume { show ->
val tag = "LOW_WIFI_SIGNAL"
if (show) {
showPersistentRedToast(
getString(R.string.toast_alert_low_wifi_signal),
R.drawable.wifi_low,
tag
)
} else {
removePersistentRedToast(tag)
showGreenToast(
getString(R.string.toast_alert_low_wifi_signal_cleared),
R.drawable.wifi_high,
2000
)
}
}
}
callViewModel.showLowCellularSignalEvent.observe(this) {
it.consume { show ->
val tag = "LOW_CELLULAR_SIGNAL"
if (show) {
showPersistentRedToast(
getString(R.string.toast_alert_low_cellular_signal),
R.drawable.cell_signal_low,
tag
)
} else {
removePersistentRedToast(tag)
showGreenToast(
getString(R.string.toast_alert_low_cellular_signal_cleared),
R.drawable.cell_signal_full,
2000
)
}
}
}
callViewModel.transferInProgressEvent.observe(this) {
it.consume {
showGreenToast(

91
app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
View file

@ -31,8 +31,6 @@ import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.core.Address
import org.linphone.core.Alert
import org.linphone.core.AlertListenerStub
import org.linphone.core.AudioDevice
import org.linphone.core.Call
import org.linphone.core.CallListenerStub
@ -54,11 +52,6 @@ import org.linphone.utils.LinphoneUtils
class CurrentCallViewModel @UiThread constructor() : ViewModel() {
companion object {
private const val TAG = "[Current Call ViewModel]"
// Keys are hardcoded in SDK
private const val ALERT_NETWORK_TYPE_KEY = "network-type"
private const val ALERT_NETWORK_TYPE_WIFI = "wifi"
private const val ALERT_NETWORK_TYPE_CELLULAR = "mobile"
}
val contact = MutableLiveData<ContactAvatarModel>()
@ -178,12 +171,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
MutableLiveData<Event<Boolean>>()
}
// Alerts related
val showLowWifiSignalEvent = MutableLiveData<Event<Boolean>>()
val showLowCellularSignalEvent = MutableLiveData<Event<Boolean>>()
private lateinit var currentCall: Call
private val callListener = object : CallListenerStub() {
@ -304,44 +291,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
}
}
@WorkerThread
override fun onNewAlertTriggered(core: Core, alert: Alert) {
val call = alert.call
if (call == null) {
Log.w(
"$TAG Alert of type [${alert.type}] triggered but with null call, ignoring..."
)
return
}
val remote = call.remoteAddress.asStringUriOnly()
Log.w("$TAG Alert of type [${alert.type}] triggered for call from [$remote]")
alert.addListener(alertListener)
if (call != currentCall) {
Log.w("$TAG Terminated alert wasn't for current call, do not display it")
return
}
if (alert.type == Alert.Type.QoSLowSignal) {
when (val networkType = alert.informations?.getString(ALERT_NETWORK_TYPE_KEY)) {
ALERT_NETWORK_TYPE_WIFI -> {
Log.i("$TAG Triggered low signal alert is for Wi-Fi")
showLowWifiSignalEvent.postValue(Event(true))
}
ALERT_NETWORK_TYPE_CELLULAR -> {
Log.i("$TAG Triggered low signal alert is for cellular")
showLowCellularSignalEvent.postValue(Event(true))
}
else -> {
Log.w(
"$TAG Unexpected type of signal [$networkType] found in alert information"
)
}
}
}
}
@WorkerThread
override fun onTransferStateChanged(core: Core, transfered: Call, state: Call.State) {
Log.i(
@ -356,46 +305,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
}
}
private val alertListener = object : AlertListenerStub() {
@WorkerThread
override fun onTerminated(alert: Alert) {
val call = alert.call
if (call == null) {
Log.w(
"$TAG Alert of type [${alert.type}] dismissed but with null call, ignoring..."
)
return
}
val remote = call.remoteAddress.asStringUriOnly()
Log.w("$TAG Alert of type [${alert.type}] dismissed for call from [$remote]")
alert.removeListener(this)
if (call != currentCall) {
Log.w("$TAG Terminated alert wasn't for current call, do not display it")
return
}
if (alert.type == Alert.Type.QoSLowSignal) {
when (val signalType = alert.informations?.getString(ALERT_NETWORK_TYPE_KEY)) {
ALERT_NETWORK_TYPE_WIFI -> {
Log.i("$TAG Wi-Fi signal no longer low")
showLowWifiSignalEvent.postValue(Event(false))
}
ALERT_NETWORK_TYPE_CELLULAR -> {
Log.i("$TAG Cellular signal no longer low")
showLowCellularSignalEvent.postValue(Event(false))
}
else -> {
Log.w(
"$TAG Unexpected type of signal [$signalType] found in alert information"
)
}
}
}
}
}
init {
coreContext.postOnCoreThread { core ->
core.addListener(coreListener)