Merge pull request #38 from privy-open-source/fix/allow-redirection

release: `1.1.0`

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "java.configuration.updateBuildConfiguration": "interactive"
+}

README.md

@@ -20,7 +20,7 @@ allprojects {
 2. Add the dependency
 ```gradle
 dependencies {
-  implementation 'dev.privyid:pena-android:1.0.0'
+  implementation 'dev.privyid:pena-android:1.1.0'
 }
 ```
 

app/build.gradle

@@ -41,4 +41,10 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }

jitpack.yml

@@ -1,4 +1,4 @@
 jdk:
-  - openjdk11
+  - openjdk20
 before_install:
   - ./scripts/prepareJitpackEnvironment.sh

pena/src/main/java/dev/privyid/pena/Pena.kt

@@ -54,7 +54,7 @@ class Pena : WebView {
 
         this.settings.domStorageEnabled = true
         this.settings.javaScriptEnabled = true
-        this.webViewClient = PenaWebClient(url)
+        this.webViewClient = PenaWebClient()
         this.addJavascriptInterface(this.bridge, "PenaAndroid")
 
         this.loadUrl(

pena/src/main/java/dev/privyid/pena/PenaWebClient.kt

@@ -1,19 +1,11 @@
 package dev.privyid.pena
 
-import android.net.Uri
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 
-class PenaWebClient(url: String) : WebViewClient() {
-    private var url: Uri = Uri.parse(url)
-
+class PenaWebClient() : WebViewClient() {
     override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
-        if (request != null) {
-            if (isSameDomain(this.url, request.url))
-                return false
-        }
-
-        return true
+        return request == null || (request.url.scheme != "http" && request.url.scheme != "https")
     }
 }

pena/src/main/java/dev/privyid/pena/Utils.kt

@@ -68,18 +68,4 @@ fun createURL(
     }
 
     return uri.build().toString()
-}
-
-fun extractDomain(url: Uri): String? {
-    val host = url.host
-    val pattern = Regex("""(?:.*\.)?([^.]+\.[^.]+)$""")
-
-    return host?.let { pattern.find(it)?.groupValues?.get(1) }
-}
-
-fun isSameDomain(a: Uri, b: Uri): Boolean {
-    val domainA = extractDomain(a)
-    val domainB = extractDomain(b)
-
-    return domainA != null && domainB != null && domainA == domainB
 }

pena/src/test/java/dev/privyid/pena/UtilsUnitTest.kt

@@ -1,5 +1,6 @@
 package dev.privyid.pena
 
+import android.net.Uri
 import org.junit.Test
 import org.junit.Assert.*
 import org.junit.runner.RunWith
@@ -8,42 +9,42 @@ import org.robolectric.RobolectricTestRunner
 @RunWith(RobolectricTestRunner::class)
 class UtilsUnitTest {
     @Test
-    fun createURL_basic () {
+    fun createURL_basic() {
         val result = createURL(url = "http://coba.com")
 
         assertEquals(result, "http://coba.com")
     }
 
     @Test
-    fun createURL_lang () {
+    fun createURL_lang() {
         val result = createURL(url = "http://coba.com", lang = "id")
 
         assertEquals(result, "http://coba.com?lang=id")
     }
 
     @Test
-    fun createURL_debug () {
+    fun createURL_debug() {
         val result = createURL(url = "http://coba.com", debug = true)
 
         assertEquals(result, "http://coba.com?debug=true")
     }
 
     @Test
-    fun createURL_visibility () {
+    fun createURL_visibility() {
         val result = createURL(url = "http://coba.com", visibility = false)
 
         assertEquals(result, "http://coba.com?visibility=false")
     }
 
     @Test
-    fun createURL_needScrollTo_number () {
+    fun createURL_needScrollTo_number() {
         val result = createURL(url = "http://coba.com", needScrollTo = 5)
 
         assertEquals(result, "http://coba.com?need_scrollto=5")
     }
 
     @Test
-    fun createURL_needScrollTo_string () {
+    fun createURL_needScrollTo_string() {
         val result = createURL(url = "http://coba.com", needScrollTo = "last")
 
         assertEquals(result, "http://coba.com?need_scrollto=last")

settings.gradle

@@ -5,6 +5,11 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {