diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index 44cf4b3cd..533ddcac7 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -178,12 +178,8 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C "$TAG Transferred call [${transfered.remoteAddress.asStringUriOnly()}] state changed [$state]" ) if (state == Call.State.Connected) { - // TODO FIXME: Remote is call being transferred, not transferee ! - val displayName = contactsManager.findDisplayName(transfered.remoteAddress) - val message = context.getString( - org.linphone.R.string.toast_call_transfer_successful, - displayName + org.linphone.R.string.toast_call_transfer_successful ) val icon = org.linphone.R.drawable.phone_transfer diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt index d027fdbda..cd0f75555 100644 --- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt @@ -178,18 +178,18 @@ class CallActivity : GenericActivity() { } callViewModel.transferInProgressEvent.observe(this) { - it.consume { remote -> + it.consume { showGreenToast( - getString(R.string.toast_call_transfer_in_progress, remote), + getString(R.string.toast_call_transfer_in_progress), R.drawable.phone_transfer ) } } callViewModel.transferFailedEvent.observe(this) { - it.consume { remote -> + it.consume { showRedToast( - getString(R.string.toast_call_transfer_failed, remote), + getString(R.string.toast_call_transfer_failed), R.drawable.warning_circle ) } diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt index c8d632b36..e7938ec3c 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt @@ -160,12 +160,12 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { MutableLiveData>() } - val transferInProgressEvent: MutableLiveData> by lazy { - MutableLiveData>() + val transferInProgressEvent: MutableLiveData> by lazy { + MutableLiveData>() } - val transferFailedEvent: MutableLiveData> by lazy { - MutableLiveData>() + val transferFailedEvent: MutableLiveData> by lazy { + MutableLiveData>() } val numpadModel: NumpadModel @@ -344,17 +344,10 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { "$TAG Transferred call [${transfered.remoteAddress.asStringUriOnly()}] state changed [$state]" ) - // TODO FIXME: Remote is call being transferred, not transferee ! if (state == Call.State.OutgoingProgress) { - val displayName = coreContext.contactsManager.findDisplayName( - transfered.remoteAddress - ) - transferInProgressEvent.postValue(Event(displayName)) + transferInProgressEvent.postValue(Event(true)) } else if (LinphoneUtils.isCallEnding(state)) { - val displayName = coreContext.contactsManager.findDisplayName( - transfered.remoteAddress - ) - transferFailedEvent.postValue(Event(displayName)) + transferFailedEvent.postValue(Event(true)) } } } @@ -721,8 +714,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { Log.i("$TAG Blind call transfer is successful") } else { Log.e("$TAG Failed to make blind call transfer!") - val displayName = coreContext.contactsManager.findDisplayName(to) - transferFailedEvent.postValue(Event(displayName)) + transferFailedEvent.postValue(Event(true)) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3e2f978c0..27f829f42 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -165,9 +165,9 @@ Text is waiting to be shared A message is waiting to be forwarded Conversation is end-to-end encrypted - Call is being transferred to %s - Call has been transferred to %s - Call transfer to %s failed! + Call is being transferred + Call has been successfully transferred + Call transfer failed! Login Scan QR code