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 6c96bf9de4c297ce1197a6ea6c758d6ffcf9c64b..41540caf4aa576ff8a80e10c52e8b1391dff2460 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())); } }