Fix FindBugs warnings. (211a3713) · Commits · e / os / Camera

app/src/main/java/net/sourceforge/opencamera/CameraController/CameraController2.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ public class CameraController2 extends CameraController {
		private boolean supports_face_detect_mode_simple;
		private boolean supports_face_detect_mode_full;
		private boolean supports_photo_video_recording;
		private final int tonemap_max_curve_points_c = 64;
		private final static int tonemap_max_curve_points_c = 64;
		private final ErrorCallback preview_error_cb;
		private final ErrorCallback camera_error_cb;
		private CameraCaptureSession captureSession;
		@@ -197,7 +197,7 @@ public class CameraController2 extends CameraController {
		We use this class instead of assigning the RequestTagType directly, so we can modify it
		(even though CaptureRequest only has a getTag() method).
		*/
		private class RequestTagObject {
		private static class RequestTagObject {
		private RequestTagType type;

		private RequestTagObject(RequestTagType type) {
		@@ -783,7 +783,6 @@ public class CameraController2 extends CameraController {
		}
		values[c++] = 1.0f;
		values[c++] = getLogProfile(1.0f);
		int n_values = c/2;
		/*{
		int n_values = 257;
		float [] values = new float [2*n_values];
		@@ -795,6 +794,7 @@ public class CameraController2 extends CameraController {
		}
		}*/
		if( MyDebug.LOG ) {
		int n_values = c/2;
		for(int i=0;i<n_values;i++) {
		float in = values[2*i];
		float out = values[2*i+1];

app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
		private final DrawPreview drawPreview;
		private final ImageSaver imageSaver;

		private final float panorama_pics_per_screen = 2.0f;
		private final static float panorama_pics_per_screen = 2.0f;

		private File last_video_file = null;
		private Uri last_video_file_saf = null;

app/src/main/java/net/sourceforge/opencamera/PermissionHandler.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -19,10 +19,10 @@ public class PermissionHandler {

		private final MainActivity main_activity;

		final private int MY_PERMISSIONS_REQUEST_CAMERA = 0;
		final private int MY_PERMISSIONS_REQUEST_STORAGE = 1;
		final private int MY_PERMISSIONS_REQUEST_RECORD_AUDIO = 2;
		final private int MY_PERMISSIONS_REQUEST_LOCATION = 3;
		final private static int MY_PERMISSIONS_REQUEST_CAMERA = 0;
		final private static int MY_PERMISSIONS_REQUEST_STORAGE = 1;
		final private static int MY_PERMISSIONS_REQUEST_RECORD_AUDIO = 2;
		final private static int MY_PERMISSIONS_REQUEST_LOCATION = 3;

		PermissionHandler(MainActivity main_activity) {
		this.main_activity = main_activity;

app/src/main/java/net/sourceforge/opencamera/Preview/Preview.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
		private boolean video_recorder_is_paused; // whether video_recorder is running but has paused
		private boolean video_restart_on_max_filesize;
		private static final long min_safe_restart_video_time = 1000; // if the remaining max time after restart is less than this, don't restart
		private class VideoFileInfo {
		private static class VideoFileInfo {
		// stores the file (or similar) to record a video
		private final int video_method;
		private final Uri video_uri; // for VIDEOMETHOD_SAF or VIDEOMETHOD_URI

app/src/main/java/net/sourceforge/opencamera/SettingsManager.java

+16 −5

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.io.StringWriter;
		import java.nio.charset.Charset;
		import java.util.Map;
		import java.util.Set;

		@@ -112,10 +113,10 @@ public class SettingsManager {
		editor.putFloat(key, Float.valueOf(parser.getAttributeValue(null, "value")));
		break;
		case int_tag:
		editor.putInt(key, Integer.valueOf(parser.getAttributeValue(null, "value")));
		editor.putInt(key, Integer.parseInt(parser.getAttributeValue(null, "value")));
		break;
		case long_tag:
		editor.putLong(key, Long.valueOf(parser.getAttributeValue(null, "value")));
		editor.putLong(key, Long.parseLong(parser.getAttributeValue(null, "value")));
		break;
		case string_tag:
		editor.putString(key, parser.getAttributeValue(null, "value"));
		@@ -166,6 +167,7 @@ public class SettingsManager {
		public void saveSettings(String filename) {
		if( MyDebug.LOG )
		Log.d(TAG, "saveSettings: " + filename);
		OutputStream outputStream = null;
		try {
		StorageUtils storageUtils = main_activity.getStorageUtils();
		/*OutputStream outputStream;
		@@ -185,7 +187,7 @@ public class SettingsManager {
		storageUtils.createFolderIfRequired(settings_folder);
		File file = new File(settings_folder.getPath() + File.separator + filename);
		main_activity.test_save_settings_file = file.getAbsolutePath();
		OutputStream outputStream = new FileOutputStream(file);
		outputStream = new FileOutputStream(file);

		XmlSerializer xmlSerializer = Xml.newSerializer();

		@@ -237,8 +239,7 @@ public class SettingsManager {
		String dataWrite = writer.toString();
		/*if( true )
		throw new IOException(); // test*/
		outputStream.write(dataWrite.getBytes());
		outputStream.close();
		outputStream.write(dataWrite.getBytes(Charset.forName("UTF-8")));

		main_activity.getPreview().showToast(null, R.string.saved_settings);
		/*if( uri != null ) {
		@@ -252,5 +253,15 @@ public class SettingsManager {
		e.printStackTrace();
		main_activity.getPreview().showToast(null, R.string.save_settings_failed);
		}
		finally {
		if( outputStream != null ) {
		try {
		outputStream.close();
		}
		catch(IOException e) {
		e.printStackTrace();
		}
		}
		}
		}
		}