arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-03-16 07:26:06 +00:00
Code Issues Releases Wiki Activity

Webview: cleanup the code a bit.

Browse Source
This commit is contained in:
Tom Hacohen 2020-10-16 18:54:28 +03:00
parent 181dd45e2c
commit b5355b47e3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt
View File

@ -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!!)