aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-11 16:50:00 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-11 16:50:00 +0200
commitdad90762b44878a436479a3998fec45111c9af46 (patch)
treefe79357af8b05a691f7c2c1f9f39fe2c78b02510 /src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
parent3677c6ec985f4b10d4d0c6a75c88973b2917ad4e (diff)
do not touch pictures that are already in the right format
fixed #522
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java')
-rw-r--r--src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 1b49e365..5def05dd 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -51,17 +51,13 @@ public class AbstractConnectionManager {
}
}
- public static Pair<InputStream,Integer> createInputStream(DownloadableFile file, boolean gcm) {
+ public static Pair<InputStream,Integer> createInputStream(DownloadableFile file, boolean gcm) throws FileNotFoundException {
FileInputStream is;
int size;
- try {
- is = new FileInputStream(file);
- size = (int) file.getSize();
- if (file.getKey() == null) {
- return new Pair<InputStream,Integer>(is,size);
- }
- } catch (FileNotFoundException e) {
- return null;
+ is = new FileInputStream(file);
+ size = (int) file.getSize();
+ if (file.getKey() == null) {
+ return new Pair<InputStream,Integer>(is,size);
}
try {
if (gcm) {