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

Renamed conferences as meetings, don't display group calls in scheduled meetings list

Browse source
This commit is contained in:
Sylvain Berfini 2022-05-18 11:15:17 +02:00
parent 91dae25936
commit 3a56969158
2 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt
View file

@ -73,6 +73,7 @@ class ScheduledConferencesViewModel : ViewModel() {
val now = System.currentTimeMillis() / 1000 // Linphone uses time_t in seconds
val oneHourAgo = now - 3600 // Show all conferences from 1 hour ago and forward
for (conferenceInfo in coreContext.core.getConferenceInformationListAfterTime(oneHourAgo)) {
if (conferenceInfo.duration == 0) continue // This isn't a scheduled conference, don't display it
val data = ScheduledConferenceData(conferenceInfo)
conferencesList.add(data)
}

56
app/src/main/res/values/strings.xml
View file

@ -233,15 +233,15 @@
<string name="recordings_empty_list">No recordings</string>
<!-- Conferencing -->
<string name="conference">Conference</string>
<string name="conference_schedule_title">Schedule a conference</string>
<string name="conference">Meeting</string>
<string name="conference_schedule_title">Schedule a meeting</string>
<string name="conference_group_call_title">Start a group call</string>
<string name="conference_schedule_later">Do you want to schedule a conference for later?</string>
<string name="conference_schedule_later">Do you want to schedule a meeting for later?</string>
<string name="conference_schedule_mandatory_field">Mandatory</string>
<string name="conference_schedule_subject_title">Subject</string>
<string name="conference_schedule_subject_hint">Conference subject</string>
<string name="conference_schedule_subject_hint">Meeting subject</string>
<string name="conference_group_call_subject_hint">Group call subject</string>
<string name="conference_schedule_address_title">Conference address</string>
<string name="conference_schedule_address_title">Meeting address</string>
<string name="conference_schedule_description_title">Add a description</string>
<string name="conference_schedule_description_hint">Description</string>
<string name="conference_schedule_date">Date</string>
@ -250,21 +250,21 @@
<string name="conference_schedule_timezone">Timezone</string>
<string name="conference_schedule_send_invite_chat">Send invite via &appName;</string>
<string name="conference_schedule_send_invite_email">Send invite via email</string>
<string name="conference_schedule_encryption">Would you like to encrypt the conference?</string>
<string name="conference_schedule_encryption">Would you like to encrypt the meeting?</string>
<string name="conference_schedule_send_invite_chat_summary">Invite will be sent out from my &appName; account</string>
<string name="conference_schedule_participants_list">Participants list</string>
<string name="conference_organizer">Organizer</string>
<string name="conference_schedule_summary">Conference info</string>
<string name="conference_schedule_summary">Meeting info</string>
<string name="conference_group_call_summary">Group call info</string>
<string name="conference_schedule_start">Schedule conference</string>
<string name="conference_schedule_start">Schedule meeting</string>
<string name="conference_group_call_create">Start group call</string>
<string name="conference_schedule_address_copied_to_clipboard">Conference address copied into clipboard</string>
<string name="conference_schedule_info_not_sent_to_participant">Failed to send conference info to a participant</string>
<string name="conference_paused_title">You are currently out of the conference.</string>
<string name="conference_schedule_address_copied_to_clipboard">Meeting address copied into clipboard</string>
<string name="conference_schedule_info_not_sent_to_participant">Failed to send meeting info to a participant</string>
<string name="conference_paused_title">You are currently out of the meeting.</string>
<string name="conference_paused_subtitle">Click on play button to join it back.</string>
<string name="conference_default_title">Remote conference</string>
<string name="conference_local_title">Local conference</string>
<string name="conference_invite_title">Conference invite:</string>
<string name="conference_default_title">Remote meeting</string>
<string name="conference_local_title">Local meeting</string>
<string name="conference_invite_title">Meeting invite:</string>
<string name="conference_description_title">Description:</string>
<string name="conference_invite_join">Join</string>
<string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d participants</string>
@ -274,26 +274,26 @@
<string name="conference_waiting_room_start_call">Start</string>
<string name="conference_waiting_room_cancel_call">Cancel</string>
<string name="conference_waiting_room_video_disabled">Video is currently disabled</string>
<string name="conference_scheduled">Conferences</string>
<string name="conference_layout_too_many_participants_for_mosaic">You can\'t change conference layout as there is too many participants</string>
<string name="conference_scheduled">Meetings</string>
<string name="conference_layout_too_many_participants_for_mosaic">You can\'t change meeting layout as there is too many participants</string>
<string name="conference_too_many_participants_for_mosaic_layout">There is too many participants for mosaic layout, switching to active speaker</string>
<string name="conference_participant_paused">(paused)</string>
<string name="conference_no_schedule">No scheduled conference yet.</string>
<string name="conference_no_schedule">No scheduled meeting yet.</string>
<string name="conference_schedule_organizer">Organizer:</string>
<string name="conference_go_to_chat">Conference\'s chat room</string>
<string name="conference_creation_failed">Failed to create conference</string>
<string name="conference_go_to_chat">Meeting\'s chat room</string>
<string name="conference_creation_failed">Failed to create meeting</string>
<string name="conference_admin_set">%s is now admin</string>
<string name="conference_admin_unset">%s is no longer admin</string>
<string name="conference_schedule_info_created">Conference has been scheduled</string>
<string name="conference_info_confirm_removal">Do you really want to delete this conference?</string>
<string name="conference_info_removed">Conference info has been deleted</string>
<string name="conference_empty">You are currently alone in this conference</string>
<string name="conference_invitation_received_notification">You have been invited to a conference</string>
<string name="conference_invitation">Conference invitation</string>
<string name="conference_schedule_info_created">Meeting has been scheduled</string>
<string name="conference_info_confirm_removal">Do you really want to delete this meeting?</string>
<string name="conference_info_removed">Meeting info has been deleted</string>
<string name="conference_empty">You are currently alone in this meeting</string>
<string name="conference_invitation_received_notification">You have been invited to a meeting</string>
<string name="conference_invitation">Meeting invitation</string>
<string name="conference_low_bandwidth">Low bandwidth detected, disabling video</string>
<string name="conference_first_to_join">You\'re the first to join the conference</string>
<string name="conference_last_user">All other participants have left the conference</string>
<string name="conference_incoming_title">Incoming conference call</string>
<string name="conference_first_to_join">You\'re the first to join the meeting</string>
<string name="conference_last_user">All other participants have left the meeting</string>
<string name="conference_incoming_title">Incoming meeting call</string>
<!-- Call -->
<string name="call_incoming_title">Incoming Call</string>