From ee23e9372bd0e910b26baecef5f18e7b57bc478b Mon Sep 17 00:00:00 2001 From: Lucas Druschke Date: Sat, 11 Aug 2018 18:10:21 +0200 Subject: [PATCH 1/3] don't fetch previews from server when URL previews are disabled Signed-off-by: Lucas Druschke --- .../im/vector/adapters/VectorMessagesAdapterHelper.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java index e31ee279b7..fa33354f5c 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java @@ -1219,7 +1219,12 @@ void manageURLPreviews(final Message message, final View convertView, final Stri final String downloadKey = url.hashCode() + "---"; String displayKey = url + "<----->" + id; - if (UrlPreviewView.Companion.didUrlPreviewDismiss(displayKey)) { + if (!this.mSession.isURLPreviewEnabled()) { + if(!mUrlsPreviews.containsKey(downloadKey)) { + mUrlsPreviews.put(downloadKey, null); + mAdapter.notifyDataSetChanged(); + } + } else if (UrlPreviewView.Companion.didUrlPreviewDismiss(displayKey)) { Log.d(LOG_TAG, "## manageURLPreviews() : " + displayKey + " has been dismissed"); } else if (mPendingUrls.contains(url)) { // please wait From 3c1ea419f3d749fea59d1f84f12a4f43cd63ec22 Mon Sep 17 00:00:00 2001 From: Lucas Druschke Date: Sat, 11 Aug 2018 19:10:52 +0200 Subject: [PATCH 2/3] fix code style violation, add description to CONTRIBUTING.rst --- CHANGES.rst | 2 +- .../java/im/vector/adapters/VectorMessagesAdapterHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2f5623c06a..a2302eff9e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Features: - Improvements: - - + - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514) Other changes: - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0 diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java index fa33354f5c..05e407b2a8 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java @@ -1220,7 +1220,7 @@ void manageURLPreviews(final Message message, final View convertView, final Stri String displayKey = url + "<----->" + id; if (!this.mSession.isURLPreviewEnabled()) { - if(!mUrlsPreviews.containsKey(downloadKey)) { + if (!mUrlsPreviews.containsKey(downloadKey)) { mUrlsPreviews.put(downloadKey, null); mAdapter.notifyDataSetChanged(); } From c0dbeeafccc585375b4274e076bcd4bc75607a26 Mon Sep 17 00:00:00 2001 From: Lucas Druschke Date: Mon, 13 Aug 2018 14:56:53 +0200 Subject: [PATCH 3/3] remove useless this --- .../java/im/vector/adapters/VectorMessagesAdapterHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java index 05e407b2a8..7d40909262 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java @@ -1219,7 +1219,7 @@ void manageURLPreviews(final Message message, final View convertView, final Stri final String downloadKey = url.hashCode() + "---"; String displayKey = url + "<----->" + id; - if (!this.mSession.isURLPreviewEnabled()) { + if (!mSession.isURLPreviewEnabled()) { if (!mUrlsPreviews.containsKey(downloadKey)) { mUrlsPreviews.put(downloadKey, null); mAdapter.notifyDataSetChanged();