Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
d40cc4b9
Commit
d40cc4b9
authored
Mar 15, 2019
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates jitsi conference finish status.
parent
38893736
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
JitsiVideoConferenceView.kt
...oid/videoconference/presenter/JitsiVideoConferenceView.kt
+2
-2
VideoConferencePresenter.kt
...oid/videoconference/presenter/VideoConferencePresenter.kt
+1
-1
VideoConferenceActivity.kt
...ket/android/videoconference/ui/VideoConferenceActivity.kt
+7
-9
No files found.
app/src/main/java/chat/rocket/android/videoconference/presenter/JitsiVideoConferenceView.kt
View file @
d40cc4b9
...
...
@@ -11,9 +11,9 @@ interface JitsiVideoConferenceView {
fun
startJitsiVideoConference
(
url
:
String
,
name
:
String
?)
/**
*
Clos
es the Jitsi video conference.
*
Finish
es the Jitsi video conference.
*/
fun
close
JitsiVideoConference
()
fun
finish
JitsiVideoConference
()
/**
* Logs the state of the Jitsi Meet conference displayed in a JitsiMeetView.
...
...
app/src/main/java/chat/rocket/android/videoconference/presenter/VideoConferencePresenter.kt
View file @
d40cc4b9
...
...
@@ -56,7 +56,7 @@ class VideoConferencePresenter @Inject constructor(
}
}
catch
(
ex
:
Exception
)
{
Timber
.
e
(
ex
)
view
.
close
JitsiVideoConference
()
view
.
finish
JitsiVideoConference
()
}
}
}
...
...
app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt
View file @
d40cc4b9
...
...
@@ -40,13 +40,6 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
presenter
.
initVideoConference
()
}
override
fun
onDestroy
()
{
super
.
onDestroy
()
presenter
.
invalidateTimer
()
view
?.
dispose
()
view
=
null
}
override
fun
onConferenceWillJoin
(
map
:
MutableMap
<
String
,
Any
>?)
=
logJitsiMeetViewState
(
"Joining video conferencing"
,
map
)
...
...
@@ -58,7 +51,7 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
override
fun
onConferenceLeft
(
map
:
MutableMap
<
String
,
Any
>?)
{
logJitsiMeetViewState
(
"Left video conferencing"
,
map
)
close
JitsiVideoConference
()
finish
JitsiVideoConference
()
}
override
fun
onLoadConfigError
(
map
:
MutableMap
<
String
,
Any
>?)
=
...
...
@@ -83,7 +76,12 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
)
}
override
fun
closeJitsiVideoConference
()
=
finish
()
override
fun
finishJitsiVideoConference
()
{
presenter
.
invalidateTimer
()
view
?.
dispose
()
view
=
null
finish
()
}
override
fun
logJitsiMeetViewState
(
message
:
String
,
map
:
MutableMap
<
String
,
Any
>?)
=
Timber
.
i
(
"$message: $map"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment