fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

add a couple extra checks to prevent crashing

Browse Source
This commit is contained in:
tibbi
2016-06-17 14:51:32 +02:00
parent f158d2ffbd
commit abb2ca51ab
3 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/simplemobiletools/camera/Preview.java
View File

@ -72,7 +72,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
curVideoPath = "";
}
public void setCamera(int cameraId) {
public boolean setCamera(int cameraId) {
currCameraId = cameraId;
Camera newCamera;
try {
@ -82,11 +82,11 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
Utils.showToast(getContext(), R.string.camera_open_error);
Log.e(TAG, "setCamera open " + e.getMessage());
callback.setIsCameraAvailable(false);
return;
return false;
}
if (camera == newCamera) {
return;
return false;
}
releaseCamera();
@ -109,6 +109,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
camera.setPreviewDisplay(surfaceHolder);
} catch (IOException e) {
Log.e(TAG, "setCamera setPreviewDisplay " + e.getMessage());
return false;
}
setupPreview();
}
@ -119,6 +120,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
if (isVideoMode) {
initRecorder();
}
return true;
}
public void setTargetUri(Uri uri) {
@ -455,12 +458,14 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
}
// VIDEO RECORDING
public void initRecorder() {
public boolean initRecorder() {
if (camera == null || recorder != null || !isSurfaceCreated)
return;
return false;
camera.lock();
final Camera.Size preferred = parameters.getPreferredPreviewSizeForVideo();
if (preferred == null)
return false;
parameters.setPreviewSize(preferred.width, preferred.height);
camera.setParameters(parameters);
@ -474,7 +479,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
curVideoPath = Utils.getOutputMediaFile(getContext(), false);
if (curVideoPath.isEmpty()) {
Utils.showToast(getContext(), R.string.video_creating_error);
return;
return false;
}
final Camera.Size videoSize = getOptimalVideoSize();
@ -495,7 +500,9 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
Utils.showToast(getContext(), R.string.video_setup_error);
Log.e(TAG, "initRecorder " + e.getMessage());
releaseCamera();
return false;
}
return true;
}
public boolean toggleRecording() {