Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

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

Merged
merged 3 commits into from
Aug 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down