Merge pull request #3934 from nextcloud/backport/3922/stable-19.0

[stable-19.0] Bugfix/3669/fix to open preview links in files app
nextcloud · May 22, 2024 · d33ce0b · d33ce0b
2 parents 556349d + 9a472c8
commit d33ce0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...rc/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt b/...rc/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt
@@ -98,7 +98,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) :
             message,
             ncApi,
             binding.referenceInclude,
-            context
+            itemView.context
         )
         binding.referenceInclude.referenceWrapper.setOnLongClickListener { l: View? ->
             commonMessageInterface.onOpenMessageActionsDialog(message)

diff --git a/...c/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt b/...c/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt
@@ -109,7 +109,7 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) :
             message,
             ncApi,
             binding.referenceInclude,
-            context
+            itemView.context
         )
         binding.referenceInclude.referenceWrapper.setOnLongClickListener { l: View? ->
             commonMessageInterface.onOpenMessageActionsDialog(message)

diff --git a/app/src/main/java/com/nextcloud/talk/utils/UriUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/UriUtils.kt
@@ -22,8 +22,8 @@ class UriUtils {
 
         fun isInstanceInternalFileShareUrl(baseUrl: String, url: String): Boolean {
             // https://cloud.nextcloud.com/f/41
-            return url.startsWith("$baseUrl/f/") || url.startsWith("$baseUrl/index.php/f/") &&
-                Regex(".*/f/d*").matches(url)
+            return (url.startsWith("$baseUrl/f/") || url.startsWith("$baseUrl/index.php/f/")) &&
+                Regex(".*/f/\\d*").matches(url)
         }
 
         fun extractInstanceInternalFileShareFileId(url: String): String {