diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Message.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 8193cbb4d..9a529877b 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -72,7 +72,7 @@ public class Message extends AbstractEntity { public static final String READ_BY_MARKERS = "readByMarkers"; public static final String MARKABLE = "markable"; public static final String ME_COMMAND = "/me"; - + public static final String ERROR_MESSAGE_CANCELLED = "eu.siacs.conversations.cancelled"; public boolean markable = false; protected String conversationUuid; @@ -708,6 +708,8 @@ public class Message extends AbstractEntity { extension = MimeUtils.extractRelevantExtension(url); } catch (MalformedURLException e) { return null; + } catch (Exception e) { + return null; } } return MimeUtils.guessMimeTypeFromExtension(extension); |