From b8760b257504c1b584abf6215c2eee0733ac34f9 Mon Sep 17 00:00:00 2001 From: Ergyun Syuleyman Date: Fri, 8 May 2020 13:01:13 +0300 Subject: [PATCH] NY-10119: [AN]: Cannot start SS if there is at least one camera started in the Video Conference --- .../communicator/data/sdk/calls/ConferenceSDKModule.java | 2 +- .../mvp/presenters/ConferenceCallPresenter.java | 4 ++-- .../ui/fragments/conference/ConferenceCallFragment.java | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java b/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java index 3af7bfeabc..5e8066ed33 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java +++ b/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java @@ -3277,7 +3277,7 @@ public class ConferenceSDKModule extends BaseSDKModule { if (mActiveConference.mConference == null) return false; return (mActiveConference.mConference.hasRemoteScreenShare() - || !mActiveConference.mData.mActiveTracks.isEmpty()); + || !mActiveConference.mData.mActiveParticipanSSTracks.isEmpty()); } public boolean isScreenSharing() { diff --git a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ConferenceCallPresenter.java b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ConferenceCallPresenter.java index f4bb992891..0e76c78047 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ConferenceCallPresenter.java +++ b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ConferenceCallPresenter.java @@ -445,8 +445,8 @@ public class ConferenceCallPresenter extends ConferenceSDKPresenter public void onClickScreenShare(boolean isShareOn) { if (getAttachedViews().size() == 0) return; ActiveConferenceCall call = mDataManager.getConferenceSDK().getActiveConference(); - if (call != null && !call.isModerator() && !mDataManager.getConferenceSDK().isP2P()) { - if (!isScreenSharing() && hasRemoteScreenShare()) { + if (call != null && !mDataManager.getConferenceSDK().isP2P()) { + if (/*!call.isModerator() &&*/ !isScreenSharing() && hasRemoteScreenShare()) { getViewState().showFirstStopScreenSharingWarning(call); return; } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java index 216afa43a9..00e46d5ecc 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java @@ -1603,11 +1603,7 @@ public class ConferenceCallFragment extends BaseFragment implements CallView, @Override public void showFirstStopScreenSharingWarning(ActiveConferenceCall call){ if (call == null) return; - String message = getString(R.string.call_ask_to_stop_ss_first, call.getConferenceSSOwner()); - if (call.isConference() && call.mData.hasRemoteVideoTrack) { - message = getString(R.string.call_ask_to_stop_camera_first, call.getConferenceSSOwner()); - } - final String msg = message; + final String msg = getString(R.string.call_ask_to_stop_ss_first, call.getConferenceSSOwner()); getActivity().runOnUiThread(() -> DialogFactory.showAlert(getActivity(), msg, getString(R.string.call_conference_alert_title), null)); -- GitLab