From ad016731e4d9ec9a0b6b5d26e8a8d1a111391f22 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Mon, 16 Nov 2020 17:00:30 +1100
Subject: [PATCH] more general regex for matching the image and title in a raw
 html

---
 .../securesms/linkpreview/LinkPreviewRepository.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
index 5401a992a1..9dde7e0fea 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -187,10 +187,16 @@ public class LinkPreviewRepository implements InjectableType {
   private @NonNull Optional<String> getProperty(@NonNull String searchText, @NonNull String property) {
     Pattern pattern = Pattern.compile("<\\s*meta\\s+property\\s*=\\s*\"\\s*og:" + property + "\\s*\"\\s+[^>]*content\\s*=\\s*\"(.*?)\"[^>]*/?\\s*>", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
     Matcher matcher = pattern.matcher(searchText);
+    if (matcher.find()) {
+      String text = Html.fromHtml(matcher.group(1)).toString();
+      if (!TextUtils.isEmpty(text)) { return Optional.of(text); }
+    }
 
+    pattern = Pattern.compile("<\\s*" + property + "[^>]*>(.*?)<\\s*/" + property + "[^>]*>", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+    matcher = pattern.matcher(searchText);
     if (matcher.find()) {
       String text = Html.fromHtml(matcher.group(1)).toString();
-      return TextUtils.isEmpty(text) ? Optional.absent() : Optional.of(text);
+      if (!TextUtils.isEmpty(text)) { return Optional.of(text); }
     }
 
     return Optional.absent();