Merge pull request #2514 from ldruschk/urlpreview

Don't fetch previews from server when URL previews are disabled

Author: bmarty

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

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 (!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