aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-08-02 10:57:50 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-08-02 10:57:50 +0200
commit8b331895d13653b6bb5f808489b428f5cfcd81a0 (patch)
tree13e9c3782d3edcd63ac0e0f298fda896cdf0021e
parented2fa20414a5071e48e1e0f6238cc4ea3c28f17d (diff)
catch NPE in getVideoPreview() because getFrame sometimes returns null
-rw-r--r--src/main/java/eu/siacs/conversations/persistance/FileBackend.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index d4063652..843cb155 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -417,7 +417,7 @@ public class FileBackend {
frame = metadataRetriever.getFrameAtTime(0);
metadataRetriever.release();
frame = resize(frame, size);
- } catch(IllegalArgumentException e) {
+ } catch(IllegalArgumentException | NullPointerException e) {
frame = Bitmap.createBitmap(size,size, Bitmap.Config.ARGB_8888);
frame.eraseColor(0xff000000);
}