awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge pull request #4306 from deltachat/wch423/call-pip-video-fix

Browse Source 
Fix remote video visibility in pip
This commit is contained in:
adb
2026-03-21 14:07:11 +01:00
committed by GitHub
parent e39134faad b1e709d5bc
commit 02466e09fe
2 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/calls/CallActivity.java
+32 -47
View File
@@ -121,7 +121,6 @@ public class CallActivity extends AppCompatActivity {
if (isInPipMode) {
topBar.setVisibility(View.GONE);
bottomLayoutContainer.setVisibility(View.GONE);
localVideoContainer.setVisibility(View.GONE);
incomingCallPrompt.setVisibility(View.GONE);
} else {
topBar.setVisibility(View.VISIBLE);
@@ -132,9 +131,9 @@ public class CallActivity extends AppCompatActivity {
updateUIForState(state);
}
}
layoutVideos();
}
layoutVideos();
updateProximityWakeLock();
});
@@ -524,7 +523,6 @@ public class CallActivity extends AppCompatActivity {
Log.d(TAG, "onNewIntent called - activity reused");
}
// TODO: resource strings
private void updateUIForState(CallViewModel.CallState state) {
Log.d(TAG, "Call state: " + state);
@@ -541,7 +539,6 @@ public class CallActivity extends AppCompatActivity {
bottomLayoutContainer.setVisibility(View.GONE);
callerIconContainer.setVisibility(View.GONE);
answerModeSelector.setVisibility(View.GONE);
remoteAvatarView.setVisibility(View.GONE);
break;
case PROMPTING_USER_ACCEPT:
@@ -550,7 +547,6 @@ public class CallActivity extends AppCompatActivity {
bottomLayoutContainer.setVisibility(View.GONE);
callerIconContainer.setVisibility(View.VISIBLE);
answerModeSelector.setVisibility(View.VISIBLE);
remoteAvatarView.setVisibility(View.GONE);
initializeAnswerModeSelector();
break;
@@ -560,7 +556,6 @@ public class CallActivity extends AppCompatActivity {
bottomLayoutContainer.setVisibility(View.VISIBLE);
callerIconContainer.setVisibility(View.GONE);
answerModeSelector.setVisibility(View.GONE);
remoteAvatarView.setVisibility(View.VISIBLE);
break;
case CONNECTING:
@@ -569,7 +564,6 @@ public class CallActivity extends AppCompatActivity {
bottomLayoutContainer.setVisibility(View.VISIBLE);
callerIconContainer.setVisibility(View.GONE);
answerModeSelector.setVisibility(View.GONE);
remoteAvatarView.setVisibility(View.VISIBLE);
break;
case CONNECTED:
@@ -578,12 +572,10 @@ public class CallActivity extends AppCompatActivity {
bottomLayoutContainer.setVisibility(View.VISIBLE);
callerIconContainer.setVisibility(View.GONE);
answerModeSelector.setVisibility(View.GONE);
remoteAvatarView.setVisibility(View.VISIBLE);
break;
case RECONNECTING:
statusText.setText(R.string.call_reconnecting);
remoteAvatarView.setVisibility(View.VISIBLE);
break;
case ENDED:
@@ -597,7 +589,6 @@ public class CallActivity extends AppCompatActivity {
bottomLayoutContainer.setVisibility(View.GONE);
callerIconContainer.setVisibility(View.GONE);
answerModeSelector.setVisibility(View.GONE);
remoteAvatarView.setVisibility(View.VISIBLE);
new Handler(Looper.getMainLooper())
.postDelayed(
@@ -702,7 +693,6 @@ public class CallActivity extends AppCompatActivity {
private void layoutVideos() {
if (isFinishing() || isDestroyed()) return;
if (viewModel == null) return;
if (isInPictureInPictureMode()) return;
CallViewModel.CallState state = viewModel.getCallState().getValue();
if (state == CallViewModel.CallState.ENDED || state == CallViewModel.CallState.ERROR) return;
@@ -715,46 +705,41 @@ public class CallActivity extends AppCompatActivity {
VideoTrack localTrack = viewModel.getLocalVideoTrack().getValue();
VideoTrack remoteTrack = viewModel.getRemoteVideoTrack().getValue();
boolean shouldShowRemoteVideoView = false;
if (state == CallViewModel.CallState.CONNECTED) {
// Call established: local in corner, remote in center
if (remoteTrack != null && Boolean.TRUE.equals(remoteVideoEnabled)) {
remoteTrack.addSink(remoteVideoView);
shouldShowRemoteVideoView = true;
}
if (localTrack != null && Boolean.TRUE.equals(videoEnabled)) {
localTrack.addSink(localVideoView);
localVideoContainer.setVisibility(View.VISIBLE);
} else {
localVideoContainer.setVisibility(View.GONE);
}
Log.d(TAG, "Video layout: Connected (local corner, remote full-screen)");
boolean showFullScreen = false;
if (state == CallViewModel.CallState.CONNECTED
&& remoteTrack != null
&& Boolean.TRUE.equals(remoteVideoEnabled)) {
remoteTrack.addSink(remoteVideoView);
showFullScreen = true;
} else if (!coordinator.isIncomingCall()
&& (state == CallViewModel.CallState.RINGING
|| state == CallViewModel.CallState.CONNECTING)) {
if (localTrack != null && Boolean.TRUE.equals(videoEnabled)) {
// Outgoing call before connected: local preview in center, hide corner
localTrack.addSink(remoteVideoView);
shouldShowRemoteVideoView = true;
localVideoContainer.setVisibility(View.GONE);
Log.d(TAG, "Video layout: Outgoing preview (local full-screen)");
} else {
localVideoContainer.setVisibility(View.GONE);
Log.d(TAG, "Video layout: Outgoing audio-only");
}
} else {
// All other cases: just show avatar
localVideoContainer.setVisibility(View.GONE);
Log.d(TAG, "Video layout: Showing avatar only");
&& (state == CallViewModel.CallState.RINGING || state == CallViewModel.CallState.CONNECTING)
&& localTrack != null
&& Boolean.TRUE.equals(videoEnabled)) {
localTrack.addSink(remoteVideoView);
showFullScreen = true;
}
remoteVideoView.setVisibility(shouldShowRemoteVideoView ? View.VISIBLE : View.GONE);
remoteVideoView.setVisibility(showFullScreen ? View.VISIBLE : View.GONE);
boolean showCorner =
state == CallViewModel.CallState.CONNECTED
&& localTrack != null
&& Boolean.TRUE.equals(videoEnabled)
&& !isInPictureInPictureMode();
if (showCorner) {
localTrack.addSink(localVideoView);
}
localVideoContainer.setVisibility(showCorner ? View.VISIBLE : View.GONE);
boolean showAvatar =
!showFullScreen
&& state != CallViewModel.CallState.PROMPTING_USER_ACCEPT
&& state != CallViewModel.CallState.INITIALIZING;
remoteAvatarView.setVisibility(showAvatar ? View.VISIBLE : View.GONE);
}
private void detachAllTracks() {