In-app browser integration

android-app/app/src/main/AndroidManifest.xml

@@ -27,9 +27,9 @@
             android:exported="true" />
         <!-- WebViewClient -->
         <activity
-            android:name=".webviewclient.WebViewClientActivity"
+            android:name=".webviewclient.CustomTabActivity"
             android:exported="true"
-            android:label="@string/webview_client" />
+            android:label="@string/custom_tabs" />
         <activity
             android:name=".webviewclient.TrustlyWebViewClientRedirectActivity"
             android:exported="true">
@@ -42,23 +42,6 @@
                 <data android:scheme="web-view-client-redirect" />
             </intent-filter>
         </activity>
-        <!-- WebChromeClient -->
-        <activity
-            android:name=".webchromeclient.WebChromeClientActivity"
-            android:exported="true"
-            android:label="@string/webchrome_client" />
-        <activity
-            android:name=".webchromeclient.TrustlyWebChromeClientRedirectActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="web-chrome-client-redirect" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>

android-app/app/src/main/java/net/trustly/inappbrowserandroid/MainActivity.kt

@@ -4,23 +4,17 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import net.trustly.inappbrowserandroid.webchromeclient.WebChromeClientActivity
-import net.trustly.inappbrowserandroid.webviewclient.WebViewClientActivity
+import net.trustly.inappbrowserandroid.webviewclient.CustomTabActivity
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val webViewClientButton = findViewById<Button>(R.id.webViewClientButton)
-        webViewClientButton.setOnClickListener {
-            startActivity(Intent(this, WebViewClientActivity::class.java))
-        }
-
-        val webViewChromeButton = findViewById<Button>(R.id.webViewChromeButton)
-        webViewChromeButton.setOnClickListener {
-            startActivity(Intent(this, WebChromeClientActivity::class.java))
+        val customTabButton = findViewById<Button>(R.id.customTabsButton)
+        customTabButton.setOnClickListener {
+            startActivity(Intent(this, CustomTabActivity::class.java))
         }
     }
 

android-app/app/src/main/java/net/trustly/inappbrowserandroid/TrustlyConstants.kt

@@ -2,7 +2,7 @@ package net.trustly.inappbrowserandroid
 
 object TrustlyConstants {
 
-    const val TRUSTLY_URL = "http://localhost:3000?integrationContext=InAppBrowser&urlScheme="
+    const val TRUSTLY_URL = "http://10.200.206.238:3001?integrationContext=FullInAppBrowser&urlScheme="
     const val OAUTH_LOGIN_PATH = "/oauth/login"
     const val TRUSTLY_PROCEED_TO_CHOOSE_ACCOUNT_SCRIPT = "javascript:window.Trustly.proceedToChooseAccount();"
 

android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/CustomTabActivity.kt

@@ -0,0 +1,24 @@
+package net.trustly.inappbrowserandroid.webviewclient
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.browser.customtabs.CustomTabsIntent
+import net.trustly.inappbrowserandroid.TrustlyConstants
+import net.trustly.inappbrowserandroid.WebViewBaseActivity
+
+class CustomTabActivity : WebViewBaseActivity() {
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        launchUrl(this@CustomTabActivity, TrustlyConstants.TRUSTLY_URL + "web-view-client-redirect")
+    }
+
+    private fun launchUrl(context: Context, url: String) {
+        val customTabsIntent = CustomTabsIntent.Builder().build()
+        customTabsIntent.launchUrl(context, Uri.parse(url))
+    }
+
+}

android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/TrustlyWebViewClientRedirectActivity.kt

@@ -9,7 +9,7 @@ class TrustlyWebViewClientRedirectActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        Intent(this, WebViewClientActivity::class.java).apply {
+        Intent(this, CustomTabActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
         }.run { startActivity(this) }
         finish()

android-app/app/src/main/res/layout/activity_main.xml

@@ -5,23 +5,13 @@
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/webViewClientButton"
+        android:id="@+id/customTabsButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/webview_client"
+        android:text="@string/custom_tabs"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/webViewChromeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/webchrome_client"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/webViewClientButton" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

android-app/app/src/main/res/values/strings.xml

@@ -1,5 +1,4 @@
 <resources>
     <string name="app_name">InAppBrowserAndroid</string>
-    <string name="webchrome_client">WebChromeClient</string>
-    <string name="webview_client">WebViewClient</string>
+    <string name="custom_tabs">Custom Tabs</string>
 </resources>