From 770041eceb5102702b83c2a68af6cd0b3fa06edf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 4 Dec 2020 09:48:48 +0100
Subject: [PATCH] PreviewUrl: setting and e2e room

---
 .../features/home/room/detail/RoomDetailViewModel.kt  | 11 ++++++++---
 .../vector/app/features/settings/VectorPreferences.kt |  9 +++++++++
 .../settings/VectorSettingsPreferencesFragment.kt     |  6 +++---
 .../src/main/res/xml/vector_settings_preferences.xml  |  3 +--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 77ed959300..40dbf9627c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1354,9 +1354,14 @@ class RoomDetailViewModel @AssistedInject constructor(
         timelineEvents.accept(snapshot)
 
         // PreviewUrl
-        // TODO Check if URL preview is enable, check if encrypted room, etc.
-        snapshot.forEach {
-            previewUrlRetriever.getPreviewUrl(it.root, viewModelScope)
+        if (vectorPreferences.showUrlPreviews()) {
+            withState { state ->
+                snapshot
+                        .takeIf { state.asyncRoomSummary.invoke()?.isEncrypted == false }
+                        ?.forEach {
+                            previewUrlRetriever.getPreviewUrl(it.root, viewModelScope)
+                        }
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 9d6ed0246c..c50692df82 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -783,6 +783,15 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_USE_ANALYTICS_KEY, false)
     }
 
+    /**
+     * Tells if the user wants to see URL previews in the timeline
+     *
+     * @return true if the user wants to see URL previews in the timeline
+     */
+    fun showUrlPreviews(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_SHOW_URL_PREVIEW_KEY, true)
+    }
+
     /**
      * Enable or disable the analytics tracking.
      *
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index a84a10f74c..58528dc405 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -64,9 +64,9 @@ class VectorSettingsPreferencesFragment @Inject constructor(
         }
 
         // Url preview
+        /*
+        TODO Note: we keep the setting client side for now
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SHOW_URL_PREVIEW_KEY)!!.let {
-            /*
-            TODO
             it.isChecked = session.isURLPreviewEnabled
 
             it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
@@ -100,8 +100,8 @@ class VectorSettingsPreferencesFragment @Inject constructor(
 
                 false
             }
-            */
         }
+        */
 
         // update keep medias period
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_MEDIA_SAVING_PERIOD_KEY)!!.let {
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index a162bf28fb..ad4cf8e3ed 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -57,8 +57,7 @@
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
             android:summary="@string/settings_inline_url_preview_summary"
-            android:title="@string/settings_inline_url_preview"
-            app:isPreferenceVisible="@bool/false_not_implemented" />
+            android:title="@string/settings_inline_url_preview" />
 
         <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"