narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

always use exif helper

Browse source
This commit is contained in:
iNPUTmice 2014-11-03 11:20:32 +01:00
parent 27f42dfb63
commit 49920649db
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -164,29 +164,12 @@ public class FileBackend {
} }
private int getRotation(Uri image) { private int getRotation(Uri image) {
if ("content".equals(image.getScheme())) { try {
try { InputStream is = mXmppConnectionService.getContentResolver()
Cursor cursor = mXmppConnectionService .openInputStream(image);
.getContentResolver() return ExifHelper.getOrientation(is);
.query(image, } catch (FileNotFoundException e) {
new String[] { MediaStore.Images.ImageColumns.ORIENTATION }, return 0;
null, null, null);
if (cursor.getCount() != 1) {
return -1;
}
cursor.moveToFirst();
return cursor.getInt(0);
} catch (IllegalArgumentException e) {
return -1;
}
} else {
try {
InputStream is = mXmppConnectionService.getContentResolver()
.openInputStream(image);
return ExifHelper.getOrientation(is);
} catch (FileNotFoundException e) {
return 0;
}
} }
} }