sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid crash on urls with missing protocols

This commit is contained in:
Daniel Gultsch 2017-04-06 11:59:15 +02:00
parent 99565a6876
commit 649d1243d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Message.java
View File

@ -655,7 +655,7 @@ public class Message extends AbstractEntity {
final String protocol = url.getProtocol(); final String protocol = url.getProtocol();
final boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}"); final boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}");
return (AesGcmURLStreamHandler.PROTOCOL_NAME.equalsIgnoreCase(protocol) && encrypted) return (AesGcmURLStreamHandler.PROTOCOL_NAME.equalsIgnoreCase(protocol) && encrypted)
|| ((protocol.equalsIgnoreCase("http") || protocol.equalsIgnoreCase("https")) && (oob || encrypted)); || (("http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol)) && (oob || encrypted));
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
return false; return false;