Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-android
Merge requests
!1542
Fixed 'paused' label briefly visible at top of conference call UI when joining
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Sylvain Berfini
requested to merge
fix/paused_conf
into
master
5 months ago
Overview
0
Commits
1
Pipelines
1
Changes
1
0
0
Compare
master
master (base)
and
latest version
latest version
42cf8fd8
1 commit,
5 months ago
1 file
+
12
−
3
Expand all files
Preferences
Preferences
File browser
List view
Tree view
Compare changes
Inline
Side-by-side
Show whitespace changes
Show one file at a time
app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
+
12
−
3
Options
View file @ 42cf8fd8
Edit in single-file editor
Open in Web IDE
Show full file
@@ -40,7 +40,7 @@ import org.linphone.ui.call.conference.view.GridBoxLayout
import
org.linphone.utils.AppUtils
import
org.linphone.utils.Event
class
ConferenceViewModel
:
GenericViewModel
()
{
class
ConferenceViewModel
@UiThread
constructor
()
:
GenericViewModel
()
{
companion
object
{
private
const
val
TAG
=
"[Conference ViewModel]"
@@ -233,6 +233,10 @@ class ConferenceViewModel : GenericViewModel() {
}
}
init
{
isPaused
.
value
=
false
}
@WorkerThread
fun
destroy
()
{
isCurrentCallInConference
.
postValue
(
false
)
@@ -254,8 +258,13 @@ class ConferenceViewModel : GenericViewModel() {
conference
.
addListener
(
conferenceListener
)
val
isIn
=
conference
.
isIn
isPaused
.
postValue
(!
isIn
)
Log
.
i
(
"$TAG We ${if (isIn) "
are
" else "
aren
'
t
"} in the conference right now"
)
val
state
=
conf
.
state
if
(
state
!=
Conference
.
State
.
CreationPending
)
{
isPaused
.
postValue
(!
isIn
)
}
Log
.
i
(
"$TAG We ${if (isIn) "
are
" else "
aren
'
t
"} in the conference right now, current state is [$state]"
)
val
screenSharing
=
conference
.
screenSharingParticipant
!=
null
isScreenSharing
.
postValue
(
screenSharing
)
Menu
Explore
Projects
Groups
Topics
Snippets