Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not show speaker hint in pip.

Browse Source
This commit is contained in:
Cody Henthorne
2020-12-08 17:18:22 -05:00
committed by Greyson Parrelli
parent 9f8e31db78
commit a564aae80a
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
View File

@@ -517,7 +517,7 @@ public class WebRtcCallView extends FrameLayout {
}
public void showSpeakerViewHint() {
groupCallSpeakerHint.get();
groupCallSpeakerHint.get().setVisibility(View.VISIBLE);
}
public void hideSpeakerViewHint() {

32
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
View File

@@ -47,6 +47,7 @@ public class WebRtcCallViewModel extends ViewModel {
private final LiveData<SafetyNumberChangeEvent> safetyNumberChangeEvent = LiveDataUtil.combineLatest(isInPipMode, identityChangedRecipients, SafetyNumberChangeEvent::new);
private final LiveData<Recipient> groupRecipient = LiveDataUtil.filter(Transformations.switchMap(liveRecipient, LiveRecipient::getLiveData), Recipient::isActiveGroup);
private final LiveData<List<GroupMemberEntry.FullMember>> groupMembers = LiveDataUtil.skip(Transformations.switchMap(groupRecipient, r -> Transformations.distinctUntilChanged(new LiveGroup(r.requireGroupId()).getFullMembers())), 1);
private final LiveData<Boolean> shouldShowSpeakerHint = Transformations.map(participantsState, this::shouldShowSpeakerHint);
private boolean canDisplayTooltipIfNeeded = true;
private boolean hasEnabledLocalVideo = false;
@@ -100,6 +101,10 @@ public class WebRtcCallViewModel extends ViewModel {
return groupMembers;
}
public LiveData<Boolean> shouldShowSpeakerHint() {
return shouldShowSpeakerHint;
}
public boolean canEnterPipMode() {
return canEnterPipMode;
}
@@ -122,12 +127,12 @@ public class WebRtcCallViewModel extends ViewModel {
@MainThread
public void setIsViewingFocusedParticipant(@NonNull CallParticipantsState.SelectedPage page) {
//noinspection ConstantConditions
participantsState.setValue(CallParticipantsState.update(participantsState.getValue(), page));
if (page == CallParticipantsState.SelectedPage.FOCUSED) {
SignalStore.tooltips().markGroupCallSpeakerViewSeen();
events.setValue(new Event.HideSpeakerViewHint());
}
//noinspection ConstantConditions
participantsState.setValue(CallParticipantsState.update(participantsState.getValue(), page));
}
public void onDismissedVideoTooltip() {
@@ -187,14 +192,6 @@ public class WebRtcCallViewModel extends ViewModel {
canDisplayTooltipIfNeeded = false;
events.setValue(new Event.ShowVideoTooltip());
}
//noinspection ConstantConditions
if (!isInPipMode.getValue() &&
webRtcViewModel.getRemoteParticipants().size() > 1 &&
webRtcViewModel.getGroupState().isConnected() &&
!SignalStore.tooltips().hasSeenGroupCallSpeakerView()) {
events.setValue(new Event.ShowSpeakerViewHint());
}
}
private boolean containsPlaceholders(@NonNull List<CallParticipant> callParticipants) {
@@ -276,6 +273,13 @@ public class WebRtcCallViewModel extends ViewModel {
return isInPipMode ? WebRtcControls.PIP : controls;
}
private boolean shouldShowSpeakerHint(@NonNull CallParticipantsState state) {
return !state.isInPipMode() &&
state.getRemoteDevicesCount() > 1 &&
state.getGroupCallState().isConnected() &&
!SignalStore.tooltips().hasSeenGroupCallSpeakerView();
}
private void startTimer() {
cancelTimer();
@@ -332,12 +336,6 @@ public class WebRtcCallViewModel extends ViewModel {
public static class DismissVideoTooltip extends Event {
}
public static class ShowSpeakerViewHint extends Event {
}
public static class HideSpeakerViewHint extends Event {
}
public static class StartCall extends Event {
private final boolean isVideoCall;