Skip to content

Commit 1b5852f

Browse files
committed
API break, replace leave() by broadcast
1 parent f93f43b commit 1b5852f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.core.app.PictureInPictureModeChangedInfo
2828
import androidx.core.util.Consumer
2929
import androidx.core.view.isVisible
3030
import androidx.lifecycle.Lifecycle
31+
import androidx.localbroadcastmanager.content.LocalBroadcastManager
3132
import com.airbnb.mvrx.Fail
3233
import com.airbnb.mvrx.Mavericks
3334
import com.airbnb.mvrx.Success
@@ -40,6 +41,7 @@ import im.vector.app.core.platform.VectorBaseActivity
4041
import im.vector.app.databinding.ActivityJitsiBinding
4142
import im.vector.lib.core.utils.compat.getParcelableExtraCompat
4243
import kotlinx.parcelize.Parcelize
44+
import org.jitsi.meet.sdk.BroadcastIntentHelper
4345
import org.jitsi.meet.sdk.JitsiMeet
4446
import org.jitsi.meet.sdk.JitsiMeetActivityDelegate
4547
import org.jitsi.meet.sdk.JitsiMeetActivityInterface
@@ -105,7 +107,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
105107

106108
override fun onDestroy() {
107109
val currentConf = JitsiMeet.getCurrentConference()
108-
jitsiMeetView?.leave()
109110
jitsiMeetView?.dispose()
110111
// Fake emitting CONFERENCE_TERMINATED event when currentConf is not null (probably when closing the PiP screen).
111112
if (currentConf != null) {
@@ -128,7 +129,8 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
128129
}
129130

130131
private fun handleLeaveConference() {
131-
jitsiMeetView?.leave()
132+
val leaveBroadcastIntent = BroadcastIntentHelper.buildHangUpIntent()
133+
LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(leaveBroadcastIntent)
132134
}
133135

134136
private fun handleConfirmSwitching(action: JitsiCallViewEvents.ConfirmSwitchingConference) {

0 commit comments

Comments
 (0)