From c0e7a34ca18fbb3d18e8d08ffd062f58799e8758 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 14 Oct 2011 17:35:34 +0200 Subject: [PATCH] Conference's pause/resume issue fixed --- src/org/linphone/LinphoneService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index b06b66025..7e82ea52d 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.linphone.LinphoneManager.LinphoneServiceListener; import org.linphone.LinphoneManager.NewOutgoingCallUiListener; import org.linphone.core.LinphoneCall; +import org.linphone.core.LinphoneCoreFactoryImpl; import org.linphone.core.Log; import org.linphone.core.OnlineStatus; import org.linphone.core.LinphoneCall.State; @@ -258,6 +259,15 @@ public final class LinphoneService extends Service implements LinphoneServiceLis // and a race condition with capture surfaceview leading to a crash LinphoneActivity.instance().startVideoActivity(); } + else if (VideoCallActivity.launched && LinphoneActivity.isInstanciated() + && !call.getCurrentParamsCopy().getVideoEnabled()) { + LinphoneActivity.instance().finishVideoActivity(); + } + } else if (state == LinphoneCall.State.CallUpdatedByRemote) { + if (VideoCallActivity.launched && LinphoneActivity.isInstanciated() + && !call.getCurrentParamsCopy().getVideoEnabled()) { + LinphoneActivity.instance().finishVideoActivity(); + } } mHandler.post(new Runnable() {