mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed code related to all day meetings + fixed duration issue when only modifiying date

Browse source
This commit is contained in:
Sylvain Berfini 2024-10-24 15:08:06 +02:00
parent 467e029599
commit eeb19846cc
3 changed files with 19 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
View file

@ -199,7 +199,6 @@ class ScheduleMeetingViewModel @UiThread constructor() : GenericViewModel() {
}
isBroadcastSelected.value = false
showBroadcastHelp.value = false
allDayMeeting.value = false
sendInvitations.value = true
selectedTimeZone.value = availableTimeZones.find {
@ -292,20 +291,20 @@ class ScheduleMeetingViewModel @UiThread constructor() : GenericViewModel() {
@UiThread
fun setStartDate(timestamp: Long) {
startTimestamp = timestamp
endTimestamp = timestamp
computeDateLabels()
}
val cal = Calendar.getInstance(
TimeZone.getTimeZone(selectedTimeZone.value?.id ?: TimeZone.getDefault().id)
)
cal.timeInMillis = timestamp
cal.set(Calendar.HOUR_OF_DAY, startHour)
cal.set(Calendar.MINUTE, startMinutes)
startTimestamp = cal.timeInMillis
@UiThread
fun getCurrentlySelectedEndDate(): Long {
return endTimestamp
}
cal.set(Calendar.HOUR_OF_DAY, endHour)
cal.set(Calendar.MINUTE, endMinutes)
endTimestamp = cal.timeInMillis
@UiThread
fun setEndDate(timestamp: Long) {
endTimestamp = timestamp
computeDateLabels()
computeTimeLabels()
}
@UiThread
@ -410,39 +409,14 @@ class ScheduleMeetingViewModel @UiThread constructor() : GenericViewModel() {
conferenceInfo.subject = subject.value
conferenceInfo.description = description.value
if (allDayMeeting.value == true) {
val cal = Calendar.getInstance(
TimeZone.getTimeZone(selectedTimeZone.value?.id ?: TimeZone.getDefault().id)
)
cal.timeInMillis = startTimestamp
cal.set(Calendar.HOUR_OF_DAY, 0)
cal.set(Calendar.MINUTE, 0)
cal.set(Calendar.SECOND, 0)
val startTime = cal.timeInMillis / 1000 // Linphone expects timestamp in seconds
cal.timeInMillis = endTimestamp
cal.set(Calendar.HOUR_OF_DAY, 0)
cal.add(Calendar.HOUR, 23)
cal.set(Calendar.MINUTE, 59)
cal.set(Calendar.SECOND, 59)
val endTime = cal.timeInMillis / 1000 // Linphone expects timestamp in seconds
val duration = ((endTime - startTime) / 60).toInt() // Linphone expects duration in minutes
Log.i(
"$TAG Scheduling meeting using start day [$startTime] and duration [$duration] (minutes)"
)
conferenceInfo.dateTime = startTime
conferenceInfo.duration = duration
} else {
val startTime = startTimestamp / 1000 // Linphone expects timestamp in seconds
val duration =
(((endTimestamp - startTimestamp) / 1000) / 60).toInt() // Linphone expects duration in minutes
Log.i(
"$TAG Scheduling meeting using start hour [$startTime] and duration [$duration] (minutes)"
)
conferenceInfo.dateTime = startTime
conferenceInfo.duration = duration
}
val startTime = startTimestamp / 1000 // Linphone expects timestamp in seconds
val duration =
(((endTimestamp - startTimestamp) / 1000) / 60).toInt() // Linphone expects duration in minutes
Log.i(
"$TAG Scheduling meeting using start hour [$startTime] and duration [$duration] (minutes)"
)
conferenceInfo.dateTime = startTime
conferenceInfo.duration = duration
val participantsList = participants.value.orEmpty()
val participantsInfoList = arrayListOf<ParticipantInfo>()

2
app/src/main/res/layout/meeting_edit_fragment.xml
View file

@ -134,7 +134,6 @@
android:text="@{viewModel.fromTime, default=`17:00`}"
android:textSize="14sp"
android:textColor="?attr/color_main2_600"
android:visibility="@{viewModel.allDayMeeting ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="@id/from_date"
app:layout_constraintTop_toBottomOf="@id/from_date" />
@ -148,7 +147,6 @@
android:text="@{viewModel.toTime, default=`18:00`}"
android:textSize="14sp"
android:textColor="?attr/color_main2_600"
android:visibility="@{viewModel.allDayMeeting ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/from_time"
app:layout_constraintTop_toTopOf="@id/from_time" />

2
app/src/main/res/layout/meeting_schedule_fragment.xml
View file

@ -273,7 +273,6 @@
android:text="@{viewModel.fromTime, default=`17:00`}"
android:textSize="14sp"
android:textColor="?attr/color_main2_600"
android:visibility="@{viewModel.allDayMeeting ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="@id/from_date"
app:layout_constraintTop_toBottomOf="@id/from_date" />
@ -287,7 +286,6 @@
android:text="@{viewModel.toTime, default=`18:00`}"
android:textSize="14sp"
android:textColor="?attr/color_main2_600"
android:visibility="@{viewModel.allDayMeeting ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/from_time"
app:layout_constraintTop_toTopOf="@id/from_time" />