TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 13:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when camera is not in ready state

Browse Source 
Fixes #3567
Closes #3570
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-08 17:37:48 -07:00 committed by Moxie Marlinspike
parent 5fdd5cad4e
commit d6d881b0ca
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import android.content.pm.ActivityInfo;
import android.hardware.Camera; import android.hardware.Camera;
import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.PreviewCallback;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
@ -240,8 +241,8 @@ public class CameraView extends FrameLayout {
if (camera != null) camera.setOneShotPreviewCallback(callback); if (camera != null) camera.setOneShotPreviewCallback(callback);
} }
public Camera.Parameters getCameraParameters() { public @Nullable Camera.Parameters getCameraParameters() {
return camera.getParameters(); return camera == null || !cameraReady ? null : camera.getParameters();
} }
void previewCreated() { void previewCreated() {

5
src/org/thoughtcrime/securesms/components/camera/QuickCamera.java
View File

@ -70,6 +70,11 @@ import java.util.List;
} }
final Parameters cameraParameters = getCameraParameters(); final Parameters cameraParameters = getCameraParameters();
if (cameraParameters == null) {
Log.w(TAG, "camera not in capture-ready state");
return;
}
setOneShotPreviewCallback(new Camera.PreviewCallback() { setOneShotPreviewCallback(new Camera.PreviewCallback() {
@Override @Override
public void onPreviewFrame(byte[] data, final Camera camera) { public void onPreviewFrame(byte[] data, final Camera camera) {