Commit afe38b1c authored by Cool-fire's avatar Cool-fire

refactor to work with jitsi 2.0.0

parent acb0f6f3
...@@ -3,14 +3,16 @@ package chat.rocket.android.videoconference.ui ...@@ -3,14 +3,16 @@ package chat.rocket.android.videoconference.ui
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.core.os.bundleOf import android.util.Log
import chat.rocket.android.videoconference.presenter.JitsiVideoConferenceView import chat.rocket.android.videoconference.presenter.JitsiVideoConferenceView
import chat.rocket.android.videoconference.presenter.VideoConferencePresenter import chat.rocket.android.videoconference.presenter.VideoConferencePresenter
import dagger.android.AndroidInjection import dagger.android.AndroidInjection
import org.jitsi.meet.sdk.JitsiMeetActivity import org.jitsi.meet.sdk.JitsiMeetActivity
import org.jitsi.meet.sdk.JitsiMeetConferenceOptions
import org.jitsi.meet.sdk.JitsiMeetView import org.jitsi.meet.sdk.JitsiMeetView
import org.jitsi.meet.sdk.JitsiMeetViewListener import org.jitsi.meet.sdk.JitsiMeetViewListener
import timber.log.Timber import timber.log.Timber
import java.net.URL
import javax.inject.Inject import javax.inject.Inject
fun Context.videoConferenceIntent(chatRoomId: String, chatRoomType: String): Intent = fun Context.videoConferenceIntent(chatRoomId: String, chatRoomType: String): Intent =
...@@ -52,34 +54,25 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView, ...@@ -52,34 +54,25 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
override fun onConferenceJoined(map: MutableMap<String, Any>?) = override fun onConferenceJoined(map: MutableMap<String, Any>?) =
logJitsiMeetViewState("Joined video conferencing", map) logJitsiMeetViewState("Joined video conferencing", map)
override fun onConferenceWillLeave(map: MutableMap<String, Any>?) = override fun onConferenceTerminated(map: MutableMap<String, Any>?) {
logJitsiMeetViewState("Leaving video conferencing", map) if(map!!.containsKey("error")) {
logJitsiMeetViewState("Terminated video conferencing with error", map)
override fun onConferenceLeft(map: MutableMap<String, Any>?) { }
logJitsiMeetViewState("Left video conferencing", map) else{
logJitsiMeetViewState("Terminated video conferencing", map)
finishJitsiVideoConference() finishJitsiVideoConference()
} }
}
override fun onLoadConfigError(map: MutableMap<String, Any>?) =
logJitsiMeetViewState("Error loading video conference config", map)
override fun onConferenceFailed(map: MutableMap<String, Any>?) =
logJitsiMeetViewState("Video conference failed", map)
override fun startJitsiVideoConference(url: String, name: String?) { override fun startJitsiVideoConference(url: String, name: String?) {
view?.loadURLObject( var options = JitsiMeetConferenceOptions.Builder()
bundleOf( .setAudioMuted(true)
"config" to bundleOf( .setVideoMuted(true)
"startWithAudioMuted" to true, .setServerURL(URL(url))
"startWithVideoMuted" to true .setAudioOnly(false)
), .build()
"context" to bundleOf(
"user" to bundleOf("name" to name), view?.join(options)
"iss" to "rocketchat-android"
),
"url" to url
)
)
} }
override fun finishJitsiVideoConference() { override fun finishJitsiVideoConference() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment