diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt index 93cd75ce2..226176041 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt @@ -606,7 +606,7 @@ class MessageModel @WorkerThread constructor( hideYear = false ) val startTime = TimestampUtils.timeToString(timestamp) - val end = timestamp + duration + val end = timestamp + (duration * 60) val endTime = TimestampUtils.timeToString(end) meetingDate.postValue(date) meetingTime.postValue("$startTime - $endTime") diff --git a/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt index c795e67ee..c5486aacd 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt @@ -49,7 +49,7 @@ class MeetingModel @WorkerThread constructor(val conferenceInfo: ConferenceInfo) private val startTime = TimestampUtils.timeToString(timestamp) - private val endTime = TimestampUtils.timeToString(timestamp + conferenceInfo.duration) + private val endTime = TimestampUtils.timeToString(timestamp + (conferenceInfo.duration * 60)) val time = "$startTime - $endTime" diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt index 0f178da60..a66027d7c 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt @@ -208,7 +208,7 @@ class MeetingViewModel @UiThread constructor() : ViewModel() { hideYear = false ) val startTime = TimestampUtils.timeToString(timestamp) - val end = timestamp + duration + val end = timestamp + (duration * 60) val endTime = TimestampUtils.timeToString(end) startTimeStamp.postValue(timestamp * 1000) endTimeStamp.postValue(end * 1000) diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt index 826d89c24..29bd59f7c 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt @@ -397,7 +397,7 @@ class MeetingWaitingRoomViewModel @UiThread constructor() : ViewModel() { hideYear = false ) val startTime = TimestampUtils.timeToString(timestamp) - val end = timestamp + duration + val end = timestamp + (duration * 60) val endTime = TimestampUtils.timeToString(end) dateTime.postValue("$date | $startTime - $endTime") diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt index 13eaec9c2..47ef15e9a 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt @@ -363,7 +363,7 @@ class ScheduleMeetingViewModel @UiThread constructor() : ViewModel() { val startTime = startTimestamp / 1000 // Linphone expects timestamp in seconds conferenceInfo.dateTime = startTime - val duration = ((endTimestamp - startTimestamp) / 1000).toInt() // Linphone expects duration in seconds + val duration = (((endTimestamp - startTimestamp) / 1000) / 60).toInt() // Linphone expects duration in minutes conferenceInfo.duration = duration val participantsList = participants.value.orEmpty() @@ -415,7 +415,7 @@ class ScheduleMeetingViewModel @UiThread constructor() : ViewModel() { val startTime = startTimestamp / 1000 // Linphone expects timestamp in seconds conferenceInfo.dateTime = startTime - val duration = ((endTimestamp - startTimestamp) / 1000).toInt() // Linphone expects duration in seconds + val duration = (((endTimestamp - startTimestamp) / 1000) / 60).toInt() // Linphone expects duration in minutes conferenceInfo.duration = duration val participantsList = participants.value.orEmpty() @@ -462,7 +462,7 @@ class ScheduleMeetingViewModel @UiThread constructor() : ViewModel() { endMinutes = 0 startTimestamp = conferenceInfo.dateTime * 1000 /* Linphone timestamps are in seconds */ endTimestamp = - (conferenceInfo.dateTime + conferenceInfo.duration) * 1000 /* Linphone timestamps are in seconds */ + (conferenceInfo.dateTime + conferenceInfo.duration * 60) * 1000 /* Linphone timestamps are in seconds */ Log.i( "$TAG Loaded start date is [$startTimestamp], loaded end date is [$endTimestamp]" ) diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml index fbcd5ff01..49b7e75fb 100644 --- a/app/src/main/res/layout/chat_conversation_send_area.xml +++ b/app/src/main/res/layout/chat_conversation_send_area.xml @@ -99,7 +99,7 @@ android:onClick="@{openFilePickerClickListener}" android:padding="8dp" android:src="@drawable/paperclip" - android:contentDescription="@string/content_description_chat_attach_media" + android:contentDescription="@string/content_description_chat_open_attach_media" app:layout_constraintBottom_toBottomOf="@id/message_area_background" app:layout_constraintEnd_toStartOf="@id/capture_image" app:layout_constraintStart_toEndOf="@id/emoji_picker_toggle"