From 9b49e6a8175643dd4ba15a27e246ea69aca27f38 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 13 Jul 2020 23:03:16 +0200
Subject: [PATCH] Use local file in a dialog though (else -> crash)

---
 .../im/vector/riotx/core/utils/Dialogs.kt     | 40 +++++++++++++++++++
 .../VectorSettingsHelpAboutFragment.kt        |  3 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt

diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
new file mode 100644
index 0000000000..9d73493e74
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotx.core.utils
+
+import android.content.Context
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.appcompat.app.AlertDialog
+
+/**
+ * Open a web view above the current activity.
+ *
+ * @param url     the url to open
+ */
+fun Context.displayInWebView(url: String) {
+    val wv = WebView(this)
+
+    // Set a WebViewClient to ensure redirection is handled directly in the WebView
+    wv.webViewClient = WebViewClient()
+
+    wv.loadUrl(url)
+    AlertDialog.Builder(this)
+            .setView(wv)
+            .setPositiveButton(android.R.string.ok, null)
+            .show()
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
index 8e8c0d70eb..a8c2569c40 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -24,6 +24,7 @@ import im.vector.matrix.android.api.Matrix
 import im.vector.riotx.R
 import im.vector.riotx.core.preference.VectorPreference
 import im.vector.riotx.core.utils.copyToClipboard
+import im.vector.riotx.core.utils.displayInWebView
 import im.vector.riotx.core.utils.openUrlInChromeCustomTab
 import im.vector.riotx.features.version.VersionProvider
 import im.vector.riotx.openOssLicensesMenuActivity
@@ -103,7 +104,7 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
         // third party notice
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY)!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            openUrlInChromeCustomTab(requireContext(), null, VectorSettingsUrls.THIRD_PARTY_LICENSES)
+            activity?.displayInWebView(VectorSettingsUrls.THIRD_PARTY_LICENSES)
             false
         }