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

Fixed build with latest SDK API changes

Browse source
This commit is contained in:
Sylvain Berfini 2022-09-12 15:57:47 +02:00
parent a56edd5f4f
commit 795ee0d40c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
View file

@ -318,8 +318,8 @@ class ChatMessageContentData(
conferenceDescription.value = conferenceInfo.description conferenceDescription.value = conferenceInfo.description
val state = conferenceInfo.state val state = conferenceInfo.state
isConferenceUpdated.value = state == ConferenceInfoState.Updated isConferenceUpdated.value = state == ConferenceInfo.State.Updated
isConferenceCancelled.value = state == ConferenceInfoState.Cancelled isConferenceCancelled.value = state == ConferenceInfo.State.Cancelled
conferenceDate.value = TimestampUtils.dateToString(conferenceInfo.dateTime) conferenceDate.value = TimestampUtils.dateToString(conferenceInfo.dateTime)
conferenceTime.value = TimestampUtils.timeToString(conferenceInfo.dateTime) conferenceTime.value = TimestampUtils.timeToString(conferenceInfo.dateTime)

6
app/src/main/java/org/linphone/activities/main/conference/data/ScheduledConferenceData.kt
View file

@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R import org.linphone.R
import org.linphone.core.ConferenceInfo import org.linphone.core.ConferenceInfo
import org.linphone.core.ConferenceInfoState import org.linphone.core.ConferenceInfo.State
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
import org.linphone.utils.LinphoneUtils import org.linphone.utils.LinphoneUtils
import org.linphone.utils.TimestampUtils import org.linphone.utils.TimestampUtils
@ -55,7 +55,7 @@ class ScheduledConferenceData(val conferenceInfo: ConferenceInfo, private val is
time.value = TimestampUtils.timeToString(conferenceInfo.dateTime) time.value = TimestampUtils.timeToString(conferenceInfo.dateTime)
date.value = TimestampUtils.toString(conferenceInfo.dateTime, onlyDate = true, shortDate = false, hideYear = false) date.value = TimestampUtils.toString(conferenceInfo.dateTime, onlyDate = true, shortDate = false, hideYear = false)
isConferenceCancelled.value = conferenceInfo.state == ConferenceInfoState.Cancelled isConferenceCancelled.value = conferenceInfo.state == State.Cancelled
val minutes = conferenceInfo.duration val minutes = conferenceInfo.duration
val hours = TimeUnit.MINUTES.toHours(minutes.toLong()) val hours = TimeUnit.MINUTES.toHours(minutes.toLong())
@ -107,7 +107,7 @@ class ScheduledConferenceData(val conferenceInfo: ConferenceInfo, private val is
} }
private fun computeBackgroundResId() { private fun computeBackgroundResId() {
backgroundResId.value = if (conferenceInfo.state == ConferenceInfoState.Cancelled) { backgroundResId.value = if (conferenceInfo.state == State.Cancelled) {
if (expanded.value == true) { if (expanded.value == true) {
R.drawable.shape_round_red_background_with_orange_border R.drawable.shape_round_red_background_with_orange_border
} else { } else {