From f08163d273ba0cdc8b415592c70cbf6d01dc618d Mon Sep 17 00:00:00 2001 From: Ergyun Syuleyman Date: Fri, 22 May 2020 02:16:06 +0300 Subject: [PATCH] -fixed black local feed after go to chat and back to the call screen - p2p calls --- .../communicator/ui/activities/calls/CallActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java b/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java index 6c96bf9de4..41540caf4a 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java @@ -86,7 +86,7 @@ public class CallActivity extends BaseActivity implements CallActivityView { addPageViewListener(); mIndicator.setSaveEnabled(false); - mIndicator.setViewPager(mViewPager, ActiveCallPagerAdapter.CallPages.CallPageActiveCallFragment.ordinal()); + mIndicator.setViewPager(mViewPager, mPagerAdapter.getFragmentPositionByType(ActiveCallPagerAdapter.CallPages.CallPageActiveCallFragment)); mIndicator.notifyDataSetChanged(); } @@ -186,8 +186,6 @@ public class CallActivity extends BaseActivity implements CallActivityView { unregisterReceiver(mBluetoothReceiver); mPagerAdapter.reset(); mViewPager.removeAllViews(); - ContextUtils.releaseRootEglBase(); - ContextUtils.releaseSSEglBase(); releaseWakeLockActivity(); super.onDestroy(); } @@ -254,7 +252,9 @@ public class CallActivity extends BaseActivity implements CallActivityView { if (activeConferenceCall == null) return; if (mPagerAdapter != null) { mPagerAdapter.initFlags(activeConferenceCall.mData.hasRemoteScreenShareTrack, - (activeConferenceCall.mData.hasRemoteVideoTrack() || activeConferenceCall.mData.isOwnStreamActive)); + ((activeConferenceCall.mData.hasRemoteVideoTrack() || + activeConferenceCall.mData.isOwnStreamActive) && + activeConferenceCall.isConference())); } } -- GitLab