diff --git a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt
index a1a0a14fa..67e7e3e03 100644
--- a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt
@@ -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)
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index add85f705..062ffea09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -233,15 +233,15 @@
No recordings
- Conference
- Schedule a conference
+ Meeting
+ Schedule a meeting
Start a group call
- Do you want to schedule a conference for later?
+ Do you want to schedule a meeting for later?
Mandatory
Subject
- Conference subject
+ Meeting subject
Group call subject
- Conference address
+ Meeting address
Add a description
Description
Date
@@ -250,21 +250,21 @@
Timezone
Send invite via &appName;
Send invite via email
- Would you like to encrypt the conference?
+ Would you like to encrypt the meeting?
Invite will be sent out from my &appName; account
Participants list
Organizer
- Conference info
+ Meeting info
Group call info
- Schedule conference
+ Schedule meeting
Start group call
- Conference address copied into clipboard
- Failed to send conference info to a participant
- You are currently out of the conference.
+ Meeting address copied into clipboard
+ Failed to send meeting info to a participant
+ You are currently out of the meeting.
Click on play button to join it back.
- Remote conference
- Local conference
- Conference invite:
+ Remote meeting
+ Local meeting
+ Meeting invite:
Description:
Join
%d participants
@@ -274,26 +274,26 @@
Start
Cancel
Video is currently disabled
- Conferences
- You can\'t change conference layout as there is too many participants
+ Meetings
+ You can\'t change meeting layout as there is too many participants
There is too many participants for mosaic layout, switching to active speaker
(paused)
- No scheduled conference yet.
+ No scheduled meeting yet.
Organizer:
- Conference\'s chat room
- Failed to create conference
+ Meeting\'s chat room
+ Failed to create meeting
%s is now admin
%s is no longer admin
- Conference has been scheduled
- Do you really want to delete this conference?
- Conference info has been deleted
- You are currently alone in this conference
- You have been invited to a conference
- Conference invitation
+ Meeting has been scheduled
+ Do you really want to delete this meeting?
+ Meeting info has been deleted
+ You are currently alone in this meeting
+ You have been invited to a meeting
+ Meeting invitation
Low bandwidth detected, disabling video
- You\'re the first to join the conference
- All other participants have left the conference
- Incoming conference call
+ You\'re the first to join the meeting
+ All other participants have left the meeting
+ Incoming meeting call
Incoming Call