aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities/Message.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-03-31 13:30:16 +0200
committerChristian Schneppe <christian@pix-art.de>2019-03-31 13:30:16 +0200
commitf2423a674a662d932d65de9712ae50aea38879dd (patch)
tree0289e7274b866e933978263ab60b86a8bb886635 /src/main/java/de/pixart/messenger/entities/Message.java
parentd301d25e28c1d381994d305da7f2cb14bce87333 (diff)
fix url detection for webpreviews
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Message.java3
1 files changed, 2 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 c8850c278..a5f81ff5b 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -607,6 +607,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS &&
!message.isGeoUri()&&
!this.isGeoUri() &&
+ !message.isWebUri() &&
!this.isWebUri() &&
!message.treatAsDownloadable() &&
!this.treatAsDownloadable() &&
@@ -788,7 +789,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
public synchronized boolean isWebUri() {
String url = body.trim();
if (isWebUri == null) {
- isWebUri = URLUtil.isValidUrl(url) && Patterns.WEB_URL.matcher(url).matches() && !url.contains(" ");
+ isWebUri = Patterns.AUTOLINK_WEB_URL.matcher(url).matches() && !url.contains(" ");
}
return isWebUri;
}