[Android): fixes crashes related to orientation (#537)

This commit is contained in:
Nathan Ward
2017-01-02 13:27:07 -08:00
committed by Zack Story
parent bd40d8a4cf
commit f301331b15
@@ -573,7 +573,9 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
);
final ExifIFD0Directory exifIFD0Directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
if (exifIFD0Directory.containsTag(ExifIFD0Directory.TAG_ORIENTATION)) {
if (exifIFD0Directory == null) {
return data;
} else if (exifIFD0Directory.containsTag(ExifIFD0Directory.TAG_ORIENTATION)) {
final int exifOrientation = exifIFD0Directory.getInt(ExifIFD0Directory.TAG_ORIENTATION);
return rotate(data, exifOrientation);
}
@@ -654,6 +656,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
final Boolean shouldMirror = options.hasKey("mirrorImage") && options.getBoolean("mirrorImage");
RCTCamera.getInstance().adjustCameraRotationToDeviceOrientation(options.getInt("type"), deviceOrientation);
camera.setPreviewCallback(null);
camera.takePicture(null, null, new Camera.PictureCallback() {
@Override
public void onPictureTaken(byte[] data, Camera camera) {