mirror of
https://github.com/apache/cordova-plugin-camera.git
synced 2025-01-19 03:42:52 +08:00
CB-1826 Android: Guard against content provider not supplying orientation
This commit is contained in:
parent
4ae4414856
commit
f3a704b59d
@ -534,14 +534,18 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
|
|||||||
}
|
}
|
||||||
|
|
||||||
private int getImageOrientation(Uri uri) {
|
private int getImageOrientation(Uri uri) {
|
||||||
String[] cols = { MediaStore.Images.Media.ORIENTATION };
|
|
||||||
Cursor cursor = cordova.getActivity().getContentResolver().query(uri,
|
|
||||||
cols, null, null, null);
|
|
||||||
int rotate = 0;
|
int rotate = 0;
|
||||||
if (cursor != null) {
|
String[] cols = { MediaStore.Images.Media.ORIENTATION };
|
||||||
cursor.moveToPosition(0);
|
try {
|
||||||
rotate = cursor.getInt(0);
|
Cursor cursor = cordova.getActivity().getContentResolver().query(uri,
|
||||||
cursor.close();
|
cols, null, null, null);
|
||||||
|
if (cursor != null) {
|
||||||
|
cursor.moveToPosition(0);
|
||||||
|
rotate = cursor.getInt(0);
|
||||||
|
cursor.close();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
// You can get an IllegalArgumentException if ContentProvider doesn't support querying for orientation.
|
||||||
}
|
}
|
||||||
return rotate;
|
return rotate;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user