mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-02-07 14:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed in-call avatar not updated when ZRTP SAS is validated + scroll to top of calls logs history on resume

Browse source
This commit is contained in:
Sylvain Berfini 2023-11-18 15:46:03 +01:00
parent c11567f095
commit d325203e8b
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -705,8 +705,14 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
"$TAG Current call media encryption is ZRTP, auth token is ${if (isDeviceTrusted) "trusted" else "not trusted yet"}"
)
isRemoteDeviceTrusted.postValue(isDeviceTrusted)
val securityLevel = if (isDeviceTrusted) SecurityLevel.Encrypted else SecurityLevel.Safe
contact.value?.trust?.postValue(securityLevel)
val securityLevel = if (isDeviceTrusted) SecurityLevel.Safe else SecurityLevel.Encrypted
val avatarModel = contact.value
if (avatarModel != null) {
avatarModel.trust.postValue(securityLevel)
contact.postValue(avatarModel)
} else {
Log.e("$TAG No avatar model found!")
}
isMediaEncrypted.postValue(true)
// When Post Quantum is available, ZRTP is Post Quantum
@ -779,18 +785,26 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
address.clean()
displayedAddress.postValue(address.asStringUriOnly())
val isDeviceTrusted = updateEncryption()
val securityLevel = if (isDeviceTrusted) SecurityLevel.Encrypted else SecurityLevel.Safe
val conferenceInfo = coreContext.core.findConferenceInformationFromUri(
call.remoteAddress
)
val model = if (conferenceInfo != null) {
coreContext.contactsManager.getContactAvatarModelForConferenceInfo(conferenceInfo)
} else {
coreContext.contactsManager.getContactAvatarModelForAddress(call.remoteAddress)
// Do not use contact avatar model from ContactsManager
// coreContext.contactsManager.getContactAvatarModelForAddress(call.remoteAddress)
val friend = coreContext.contactsManager.findContactByAddress(call.remoteAddress)
if (friend != null) {
ContactAvatarModel(friend)
} else {
val fakeFriend = coreContext.core.createFriend()
fakeFriend.name = LinphoneUtils.getDisplayName(address)
fakeFriend.address = call.remoteAddress
ContactAvatarModel(fakeFriend)
}
}
model.trust.postValue(securityLevel)
updateEncryption()
contact.postValue(model)
displayedName.postValue(model.friend.name)

3
app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
View file

@ -240,6 +240,9 @@ class HistoryListFragment : AbstractTopBarFragment() {
Log.i("$TAG Fragment is resumed, resetting missed calls count")
sharedViewModel.resetMissedCallsCountEvent.value = Event(true)
// Scroll to top to display latest call logs
binding.historyList.scrollToPosition(0)
}
private fun copyNumberOrAddressToClipboard(value: String) {