TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-27 08:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not show join banner in pip mode.

Browse Source
This commit is contained in:
Alex Hart
2020-12-07 17:45:13 -04:00
parent 167b9c13e5
commit bfa56f771d
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
View File

@@ -81,7 +81,6 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
private CallParticipantsListDialog participantsListDialog;
private WebRtcCallView callScreen;
private TooltipPopup videoTooltip;
@@ -189,6 +188,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
@Override
public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
viewModel.setIsInPipMode(isInPictureInPictureMode);
participantUpdateWindow.setEnabled(!isInPictureInPictureMode);
}
private boolean enterPipModeIfPossible() {
@@ -198,6 +198,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
.build();
enterPictureInPictureMode(params);
CallParticipantsListDialog.dismiss(getSupportFragmentManager());
return true;
}
return false;

14
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
View File

@@ -34,6 +34,8 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
private final Set<CallParticipantListUpdate.Holder> pendingAdditions = new HashSet<>();
private final Set<CallParticipantListUpdate.Holder> pendingRemovals = new HashSet<>();
private boolean isEnabled = true;
public CallParticipantsListUpdatePopupWindow(@NonNull ViewGroup parent) {
super(LayoutInflater.from(parent.getContext()).inflate(R.layout.call_participant_list_update, parent, false),
ViewGroup.LayoutParams.MATCH_PARENT,
@@ -59,6 +61,14 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
}
}
public void setEnabled(boolean isEnabled) {
this.isEnabled = isEnabled;
if (!isEnabled) {
dismiss();
}
}
private void showPending() {
if (!pendingAdditions.isEmpty()) {
showAdditions();
@@ -82,6 +92,10 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
}
private void show() {
if (!isEnabled) {
return;
}
showAtLocation(parent, Gravity.TOP | Gravity.START, 0, 0);
measureChild();
update();