From 12eb1ea68d554171036ac0b8e3f6b19bb69119d8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 22 Dec 2020 14:26:20 +0100 Subject: [PATCH] Hide empty URL previews Change-Id: I10a2f78e7efa96249adb7cd4849e54150a08001a --- .../android/sdk/api/session/media/PreviewUrlData.kt | 9 ++++++++- .../home/room/detail/timeline/url/PreviewUrlRetriever.kt | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt index 33fc8b052b..5777db6708 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt @@ -48,4 +48,11 @@ data class PreviewUrlData( val description: String?, // Value of field "og:image" val mxcUrl: String? -) +) { + fun isPreviewable(): Boolean { + return siteName?.isNotEmpty() == true || + title?.isNotEmpty() == true || + description?.isNotEmpty() == true || + mxcUrl?.isNotEmpty() == true + } +} diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt index 695661feeb..5f7b114990 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt @@ -65,6 +65,8 @@ class PreviewUrlRetriever(session: Session) { // Blocked after the request has been sent? if (urlToRetrieve in blockedUrl) { updateState(eventId, PreviewUrlUiState.NoUrl) + } else if (!it.isPreviewable()) { // Nothing to show + updateState(eventId, PreviewUrlUiState.NoUrl) } else { updateState(eventId, PreviewUrlUiState.Data(eventId, urlToRetrieve, it)) }