empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Mute the camera if Signal loses focus.

Browse source 
Addresses #12754.
This commit is contained in:
Nicholas 2023-04-24 16:32:35 -04:00
parent 763e14f25f
commit d70213e031
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,6 @@ import android.view.WindowManager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.util.Consumer; import androidx.core.util.Consumer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
@ -469,7 +468,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
.ifNecessary() .ifNecessary()
.withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted) .withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted)
.withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName)) .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName))
.onAllGranted(() -> ApplicationDependencies.getSignalCallManager().setMuteVideo(!muted)) .onAllGranted(() -> ApplicationDependencies.getSignalCallManager().setEnableVideo(!muted))
.execute(); .execute();
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/ringrtc/Camera.java
View file

@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.ringrtc; package org.thoughtcrime.securesms.ringrtc;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraCharacteristics;
@ -318,6 +317,7 @@ public class Camera implements CameraControl, CameraVideoCapturer.CameraSwitchHa
@Override @Override
public void onCapturerStopped() { public void onCapturerStopped() {
observer.onCapturerStopped(); observer.onCapturerStopped();
cameraEventListener.onCameraStopped();
} }
@Override @Override

6
app/src/main/java/org/thoughtcrime/securesms/ringrtc/CameraEventListener.java
View file

@ -2,7 +2,13 @@ package org.thoughtcrime.securesms.ringrtc;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
/**
* Event listener that are (indirectly) bound to WebRTC events.
* onFullyInitialized and onCameraStopped are hardware lifecycle methods triggered by our implementation of {@link org.webrtc.CapturerObserver}
* onCameraSwitchCompleted is triggered by {@link org.webrtc.CameraVideoCapturer.CameraSwitchHandler}
*/
public interface CameraEventListener { public interface CameraEventListener {
void onFullyInitialized(); void onFullyInitialized();
void onCameraSwitchCompleted(@NonNull CameraState newCameraState); void onCameraSwitchCompleted(@NonNull CameraState newCameraState);
void onCameraStopped();
} }

8
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
View file

@ -226,7 +226,7 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
process((s, p) -> p.handleSetMuteAudio(s, enabled)); process((s, p) -> p.handleSetMuteAudio(s, enabled));
} }
public void setMuteVideo(boolean enabled) { public void setEnableVideo(boolean enabled) {
process((s, p) -> p.handleSetEnableVideo(s, enabled)); process((s, p) -> p.handleSetEnableVideo(s, enabled));
} }
@ -817,6 +817,12 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
process((s, p) -> p.handleCameraSwitchCompleted(s, newCameraState)); process((s, p) -> p.handleCameraSwitchCompleted(s, newCameraState));
} }
@Override
public void onCameraStopped() {
Log.i(TAG, "Camera error. Muting video.");
setEnableVideo(false);
}
@Override @Override
public void onForeground() { public void onForeground() {
process((s, p) -> { process((s, p) -> {