aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-06-16 22:40:51 +0200
committerChristian Schneppe <christian@pix-art.de>2018-06-16 22:40:51 +0200
commit353a49fdea0753968f54dc36a185bd1d2b219929 (patch)
treefd83086beb52e16e2ebaa27f909af3f513634a41 /src/main
parentfbe62a153ffed4dae226d46c68a5ee09d8e38ba6 (diff)
catch NPE in exif detection
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 40cd257fb..e966ad109 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -814,7 +814,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
} catch (IOException e) {
e.printStackTrace();
}
- orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+ orientation = exif != null ? exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL) : 0;
}
Log.d(Config.LOGTAG, "EXIF: " + orientation);
Bitmap rotated_image = null;