diff --git a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt index 2c3d60b59..e766cfc5e 100644 --- a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt @@ -31,10 +31,12 @@ class CallLogModel @WorkerThread constructor(private val callLog: CallLog) { val avatarModel: ContactAvatarModel - @IntegerRes - val iconResId = MutableLiveData() + val wasConference: Boolean - val dateTime = MutableLiveData() + @IntegerRes + val iconResId: Int + + val dateTime: String val friendRefKey: String? @@ -49,9 +51,10 @@ class CallLogModel @WorkerThread constructor(private val callLog: CallLog) { TimestampUtils.toString(timestamp, onlyDate = true, shortDate = true, hideYear = true) } val time = TimestampUtils.timeToString(timestamp) - dateTime.postValue("$date | $time") + dateTime = "$date | $time" - if (callLog.wasConference()) { + wasConference = callLog.wasConference() + if (wasConference) { val conferenceInfo = coreContext.core.findConferenceInformationFromUri(address) if (conferenceInfo != null) { avatarModel = coreContext.contactsManager.getContactAvatarModelForConferenceInfo( @@ -78,7 +81,7 @@ class CallLogModel @WorkerThread constructor(private val callLog: CallLog) { } displayedAddress = avatarModel.friend.address?.asStringUriOnly() ?: address.asStringUriOnly() - iconResId.postValue(LinphoneUtils.getCallIconResId(callLog.status, callLog.dir)) + iconResId = LinphoneUtils.getCallIconResId(callLog.status, callLog.dir) } @UiThread diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml index fe4c0cc37..a2c0918ad 100644 --- a/app/src/main/res/layout/history_list_cell.xml +++ b/app/src/main/res/layout/history_list_cell.xml @@ -109,7 +109,7 @@ android:layout_width="@dimen/icon_size" android:layout_height="@dimen/icon_size" android:layout_marginEnd="6dp" - android:src="@drawable/phone" + android:src="@{model.wasConference ? @drawable/meeting : @drawable/phone, default=@drawable/phone}" app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name"