Merge pull request #3021 from vector-im/feature/bma/filter_some_url_preview

Disable URL preview for some domains (#2995)

CHANGES.md

@@ -13,6 +13,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
  - Handle encrypted reactions (#2509)
+ - Disable URL preview for some domains (#2995)
 
 Translations 🗣:
  -

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt

@@ -52,7 +52,7 @@ class PreviewUrlRetriever(session: Session,
                 // The event is not known or it has been edited
                 // Keep only the first URL for the moment
                 val url = mediaService.extractUrls(event)
-                        .firstOrNull()
+                        .firstOrNull { canShowUrlPreview(it) }
                         ?.takeIf { it !in blockedUrl }
                 if (url == null) {
                     updateState(eventId, latestEventId, PreviewUrlUiState.NoUrl)
@@ -98,6 +98,10 @@ class PreviewUrlRetriever(session: Session,
         }
     }
 
+    private fun canShowUrlPreview(url: String): Boolean {
+        return blockedDomains.all { !url.startsWith(it) }
+    }
+
     fun doNotShowPreviewUrlFor(eventId: String, url: String) {
         blockedUrl.add(url)
 
@@ -143,5 +147,12 @@ class PreviewUrlRetriever(session: Session,
     companion object {
         // One week in millis
         private const val CACHE_VALIDITY: Long = 7 * 24 * 3_600 * 1_000
+
+        private val blockedDomains = listOf(
+                "https://matrix.to",
+                "https://app.element.io",
+                "https://staging.element.io",
+                "https://develop.element.io"
+        )
     }
 }