From b5355b47e3de91e29b4c493cabfcfd615fdc5811 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 16 Oct 2020 18:54:28 +0300 Subject: [PATCH] Webview: cleanup the code a bit. --- .../com/etesync/syncadapter/ui/WebViewActivity.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt index 67ef44e5..f56ca8af 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt @@ -166,7 +166,7 @@ class WebViewActivity : BaseActivity() { fun openUrl(context: Context, uri: Uri) { if (isAllowedUrl(uri)) { val intent = Intent(context, WebViewActivity::class.java) - intent.putExtra(WebViewActivity.KEY_URL, uri) + intent.putExtra(KEY_URL, uri) context.startActivity(intent) } else { try { @@ -191,7 +191,14 @@ class WebViewActivity : BaseActivity() { } private fun isAllowedUrl(uri: Uri): Boolean { - val allowedUris = arrayOf(Constants.faqUri, Constants.helpUri, Constants.registrationUrl, Constants.dashboard, Constants.webUri.buildUpon().appendEncodedPath("tos/").build(), Constants.webUri.buildUpon().appendEncodedPath("about/").build()) + val allowedUris = arrayOf( + Constants.faqUri, + Constants.helpUri, + Constants.registrationUrl, + Constants.dashboard, + Constants.webUri.buildUpon().appendEncodedPath("tos/").build(), + Constants.webUri.buildUpon().appendEncodedPath("about/").build(), + ) val accountsUri = Constants.webUri.buildUpon().appendEncodedPath("accounts/").build() return allowedUris(allowedUris, uri) || uri.host == accountsUri.host && uri.path!!.startsWith(accountsUri.path!!)