TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-21 19:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent a thread race in CameraView

Browse Source 
when a camera preview surface is destroyed, send it down the same pipelien
to make sure a race condition isn't hit

fixes #3864
Closes #3875
// FREEBIE
This commit is contained in:
Jake McGinty 2015-08-03 13:26:07 -07:00 committed by Moxie Marlinspike
parent 324c85cd9f
commit 52e4abf562
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/components/camera/CameraView.java
View File

@ -137,9 +137,7 @@ public class CameraView extends FrameLayout {
} }
@Override protected Void onRunBackground() { @Override protected Void onRunBackground() {
if (camera != null) {
previewDestroyed(); previewDestroyed();
}
return null; return null;
} }

2
src/org/thoughtcrime/securesms/components/camera/SurfacePreviewStrategy.java
View File

@ -56,7 +56,7 @@ class SurfacePreviewStrategy implements PreviewStrategy,
@Override @Override
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
Log.w(TAG, "surfaceDestroyed()"); Log.w(TAG, "surfaceDestroyed()");
cameraView.previewDestroyed(); cameraView.onPause();
} }
@Override @Override

2
src/org/thoughtcrime/securesms/components/camera/TexturePreviewStrategy.java
View File

@ -55,7 +55,7 @@ class TexturePreviewStrategy implements PreviewStrategy,
@Override @Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) { public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
Log.w(TAG, "onSurfaceTextureDestroyed()"); Log.w(TAG, "onSurfaceTextureDestroyed()");
cameraView.previewDestroyed(); cameraView.onPause();
return(true); return(true);
} }