Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Display call error reason as Snack + small audio call overlay improvement

Browse source
This commit is contained in:
Sylvain Berfini 2020-06-17 10:49:33 +02:00
parent e204e8d990
commit fd3f3a076e
5 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -142,9 +142,9 @@ repositories {
url file(LinphoneSdkBuildDir + '/maven_repository/')
}
/*maven {
maven {
url "https://linphone.org/maven_repository"
}*/
}
}
dependencies {

6
app/src/main/java/org/linphone/activities/main/MainActivity.kt
View file

@ -87,6 +87,12 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
}
})
coreContext.callErrorMessageResourceId.observe(this, Observer {
it.consume { messageResourceId ->
showSnackBar(messageResourceId)
}
})
binding.setGoBackToCallClickListener {
val intent = Intent(this, CallActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)

8
app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
View file

@ -52,11 +52,11 @@ class SharedMainViewModel : ViewModel() {
val selectedContact = MutableLiveData<Contact>()
/* Call */
var pendingCallTransfer: Boolean = false
/* Accounts */
val proxyConfigRemoved = MutableLiveData<Boolean>()
/* Call */
var pendingCallTransfer: Boolean = false
}

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

@ -29,9 +29,11 @@ import android.os.Vibrator
import android.telephony.PhoneStateListener
import android.telephony.TelephonyManager
import android.view.*
import androidx.lifecycle.MutableLiveData
import java.io.File
import kotlin.math.abs
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.activities.call.CallActivity
import org.linphone.activities.call.IncomingCallActivity
import org.linphone.activities.call.OutgoingCallActivity
@ -42,6 +44,7 @@ import org.linphone.core.tools.Log
import org.linphone.mediastream.Version
import org.linphone.notifications.NotificationsManager
import org.linphone.utils.AppUtils
import org.linphone.utils.Event
import org.linphone.utils.LinphoneUtils
class CoreContext(val context: Context, coreConfig: Config) {
@ -66,6 +69,10 @@ class CoreContext(val context: Context, coreConfig: Config) {
NotificationsManager(context)
}
val callErrorMessageResourceId: MutableLiveData<Event<Int>> by lazy {
MutableLiveData<Event<Int>>()
}
private var gsmCallActive = false
private val phoneStateListener = object : PhoneStateListener() {
override fun onCallStateChanged(state: Int, phoneNumber: String?) {
@ -171,6 +178,22 @@ class CoreContext(val context: Context, coreConfig: Config) {
removeCallOverlay()
}
if (state == Call.State.Error) {
Log.w("[Context] Call error reason is ${call.errorInfo.reason}")
val id = when (call.errorInfo.reason) {
Reason.Busy -> R.string.call_error_user_busy
Reason.IOError -> R.string.call_error_io_error
Reason.NotAcceptable -> R.string.call_error_incompatible_media_params
Reason.NotFound -> R.string.call_error_user_not_found
else -> R.string.call_error_unknown
}
callErrorMessageResourceId.value = Event(id)
} else if (state == Call.State.End && call.errorInfo.reason == Reason.Declined) {
Log.i("[Context] Call has been declined")
val id = R.string.call_error_declined
callErrorMessageResourceId.value = Event(id)
}
}
}
}
@ -317,6 +340,7 @@ class CoreContext(val context: Context, coreConfig: Config) {
val address: Address? = core.interpretUrl(stringAddress)
if (address == null) {
Log.e("[Context] Failed to parse $stringAddress, abort outgoing call")
callErrorMessageResourceId.value = Event(R.string.call_error_network_unreachable)
return
}
@ -326,6 +350,7 @@ class CoreContext(val context: Context, coreConfig: Config) {
fun startCall(address: Address, forceZRTP: Boolean = false) {
if (!core.isNetworkReachable) {
Log.e("[Context] Network unreachable, abort outgoing call")
callErrorMessageResourceId.value = Event(R.string.call_error_network_unreachable)
return
}
@ -388,11 +413,11 @@ class CoreContext(val context: Context, coreConfig: Config) {
params.x = overlayX.toInt()
params.y = overlayY.toInt()
params.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
val overlay = LayoutInflater.from(context).inflate(org.linphone.R.layout.call_overlay, null)
val overlay = LayoutInflater.from(context).inflate(R.layout.call_overlay, null)
var initX = overlayX
var initY = overlayY
overlay.setOnTouchListener { _, event ->
overlay.setOnTouchListener { view, event ->
when (event.action) {
MotionEvent.ACTION_DOWN -> {
initX = params.x - event.rawX
@ -408,8 +433,7 @@ class CoreContext(val context: Context, coreConfig: Config) {
}
MotionEvent.ACTION_UP -> {
if (abs(overlayX - params.x) < 5 && abs(overlayY - params.y) < 5) {
Log.i("[Core Context] Overlay clicked, go back to call view")
onCallStarted()
view.performClick()
}
overlayX = params.x.toFloat()
overlayY = params.y.toFloat()
@ -418,6 +442,10 @@ class CoreContext(val context: Context, coreConfig: Config) {
}
true
}
overlay.setOnClickListener {
Log.i("[Context] Overlay clicked, go back to call view")
onCallStarted()
}
callOverlay = overlay
windowManager.addView(overlay, params)

7
app/src/main/res/values/strings.xml
View file

@ -189,6 +189,13 @@
<string name="call_notification_outgoing">Outgoing call</string>
<string name="call_notification_active">Call running</string>
<string name="call_conference_title">Conference</string>
<string name="call_error_declined">Call has been declined</string>
<string name="call_error_user_busy">User is busy</string>
<string name="call_error_user_not_found">User hasn\'t been found</string>
<string name="call_error_incompatible_media_params">Incompatible media parameters</string>
<string name="call_error_network_unreachable">Network is unreachable</string>
<string name="call_error_io_error">Network error</string>
<string name="call_error_unknown">Unknown error</string>
<!-- Call stats -->
<string name="call_stats_audio">Audio</string>