Use local file in a dialog though (else -> crash)
This commit is contained in:
parent
bef0c7725b
commit
9b49e6a817
|
@ -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()
|
||||||
|
}
|
|
@ -24,6 +24,7 @@ import im.vector.matrix.android.api.Matrix
|
||||||
import im.vector.riotx.R
|
import im.vector.riotx.R
|
||||||
import im.vector.riotx.core.preference.VectorPreference
|
import im.vector.riotx.core.preference.VectorPreference
|
||||||
import im.vector.riotx.core.utils.copyToClipboard
|
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.core.utils.openUrlInChromeCustomTab
|
||||||
import im.vector.riotx.features.version.VersionProvider
|
import im.vector.riotx.features.version.VersionProvider
|
||||||
import im.vector.riotx.openOssLicensesMenuActivity
|
import im.vector.riotx.openOssLicensesMenuActivity
|
||||||
|
@ -103,7 +104,7 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
|
||||||
// third party notice
|
// third party notice
|
||||||
findPreference<VectorPreference>(VectorPreferences.SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY)!!
|
findPreference<VectorPreference>(VectorPreferences.SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY)!!
|
||||||
.onPreferenceClickListener = Preference.OnPreferenceClickListener {
|
.onPreferenceClickListener = Preference.OnPreferenceClickListener {
|
||||||
openUrlInChromeCustomTab(requireContext(), null, VectorSettingsUrls.THIRD_PARTY_LICENSES)
|
activity?.displayInWebView(VectorSettingsUrls.THIRD_PARTY_LICENSES)
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue