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

Fix camera initialization error for disabled hardware.

Browse source
This commit is contained in:
Alex Hart 2022-08-04 11:02:28 -03:00 • committed by Greyson Parrelli
parent 0a2696113c
commit c21b0cd145
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View file

@ -29,7 +29,6 @@ import androidx.camera.core.CameraSelector;
import androidx.camera.core.ImageCapture;
import androidx.camera.core.ImageCaptureException;
import androidx.camera.core.ImageProxy;
import androidx.camera.lifecycle.ProcessCameraProvider;
import androidx.camera.view.CameraController;
import androidx.camera.view.LifecycleCameraController;
import androidx.camera.view.PreviewView;
@ -315,9 +314,8 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
previewView.setScaleType(PreviewView.ScaleType.FILL_CENTER);
ProcessCameraProvider.getInstance(requireContext())
.addListener(() -> initializeFlipButton(flipButton, flashButton),
Executors.mainThreadExecutor());
cameraController.getInitializationFuture()
.addListener(() -> initializeFlipButton(flipButton, flashButton), Executors.mainThreadExecutor());
flashButton.setAutoFlashEnabled(cameraController.getImageCaptureFlashMode() >= ImageCapture.FLASH_MODE_AUTO);
flashButton.setFlash(cameraController.getImageCaptureFlashMode());