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

catch some more exception when retrieving media runtime

Browse source
This commit is contained in:
Daniel Gultsch 2017-11-10 20:17:42 +01:00
parent a37f7478e6
commit f4638d7eec
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -809,7 +809,7 @@ public class FileBackend {
MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever(); MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
mediaMetadataRetriever.setDataSource(mXmppConnectionService,uri); mediaMetadataRetriever.setDataSource(mXmppConnectionService,uri);
return Integer.parseInt(mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)); return Integer.parseInt(mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION));
} catch (IllegalArgumentException e) { } catch (RuntimeException e) {
return 0; return 0;
} }
} }
@ -840,7 +840,7 @@ public class FileBackend {
try { try {
metadataRetriever.setDataSource(file.getAbsolutePath()); metadataRetriever.setDataSource(file.getAbsolutePath());
} catch (Exception e) { } catch (Exception e) {
throw new NotAVideoFile(); throw new NotAVideoFile(e);
} }
return getVideoDimensions(metadataRetriever); return getVideoDimensions(metadataRetriever);
} }
@ -907,7 +907,13 @@ public class FileBackend {
} }
private static class NotAVideoFile extends Exception { private static class NotAVideoFile extends Exception {
public NotAVideoFile(Throwable t) {
super(t);
}
public NotAVideoFile() {
super();
}
} }
public class FileCopyException extends Exception { public class FileCopyException extends Exception {