TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 10:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

CameraX cleanup.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-23 22:43:10 -07:00
parent b57fab8c75
commit 631005e565
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View File

@ -101,7 +101,7 @@ public class CameraXFragment extends Fragment implements CameraFragment {
this.camera = view.findViewById(R.id.camerax_camera); this.camera = view.findViewById(R.id.camerax_camera);
this.controlsContainer = view.findViewById(R.id.camerax_controls_container); this.controlsContainer = view.findViewById(R.id.camerax_controls_container);
camera.bindToLifecycle(this); camera.bindToLifecycle(getViewLifecycleOwner());
camera.setCameraLensFacing(CameraXUtil.toLensFacing(TextSecurePreferences.getDirectCaptureCameraId(requireContext()))); camera.setCameraLensFacing(CameraXUtil.toLensFacing(TextSecurePreferences.getDirectCaptureCameraId(requireContext())));
onOrientationChanged(getResources().getConfiguration().orientation); onOrientationChanged(getResources().getConfiguration().orientation);
@ -122,8 +122,6 @@ public class CameraXFragment extends Fragment implements CameraFragment {
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
CameraX.unbindAll();
closeVideoFileDescriptor(); closeVideoFileDescriptor();
} }
@ -353,7 +351,7 @@ public class CameraXFragment extends Fragment implements CameraFragment {
public void onCaptureSuccess(ImageProxy image, int rotationDegrees) { public void onCaptureSuccess(ImageProxy image, int rotationDegrees) {
flashHelper.endFlash(); flashHelper.endFlash();
SimpleTask.run(CameraXFragment.this.getLifecycle(), () -> { SimpleTask.run(CameraXFragment.this.getViewLifecycleOwner().getLifecycle(), () -> {
stopwatch.split("captured"); stopwatch.split("captured");
try { try {
return CameraXUtil.toJpeg(image, rotationDegrees, camera.getCameraLensFacing() == CameraX.LensFacing.FRONT); return CameraXUtil.toJpeg(image, rotationDegrees, camera.getCameraLensFacing() == CameraX.LensFacing.FRONT);
@ -388,6 +386,7 @@ public class CameraXFragment extends Fragment implements CameraFragment {
if (videoFileDescriptor != null) { if (videoFileDescriptor != null) {
try { try {
videoFileDescriptor.close(); videoFileDescriptor.close();
videoFileDescriptor = null;
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to close video file descriptor", e); Log.w(TAG, "Failed to close video file descriptor", e);
} }