Merge branch '205-intercept-fallback-redirect-scheme-in-webview' into 'master'

Resolve "Intercept fallback redirect scheme in WebView"

Closes #205

See merge request pace/mobile/android/pace-cloud-sdk!218

Author: Martin Dinh

CHANGELOG.md

@@ -13,6 +13,7 @@ x.y.z Release notes (yyyy-MM-dd)
 ### Fixes
 
 * Fix a bug where the `additionalParameters` of the `CustomOIDConfiguration` were overwritten by the values from the `PACECloudSDK.additionalQueryParams`
+* Fix a bug where the payment process was not possible if the `pace_redirect_scheme` is not specified
 
 ### Internal
 

library/src/main/java/cloud/pace/sdk/appkit/app/deeplink/WebViewActivity.kt

@@ -80,8 +80,10 @@ class WebViewActivity : AppCompatActivity() {
 
     private fun intercept(newUri: Uri?): Boolean {
         // Intercept redirect service deep link
-        return if (newUri?.scheme == DeviceUtils.getPACERedirectScheme(this)) {
-            startActivity(Intent(Intent.ACTION_VIEW, newUri))
+        return if (newUri?.scheme == DeviceUtils.getPACERedirectScheme(this) || newUri?.scheme == FALLBACK_REDIRECT_SCHEME) {
+            val newIntent = Intent(this, RedirectUriReceiverActivity::class.java)
+            newIntent.data = newUri
+            startActivity(newIntent)
             true
         } else {
             false
@@ -102,4 +104,9 @@ class WebViewActivity : AppCompatActivity() {
         }
         super.onDestroy()
     }
+
+    companion object {
+        // Is needed so that the payment process also works for apps that have not set a redirect scheme (e.g. instant apps)
+        private const val FALLBACK_REDIRECT_SCHEME = "cloudsdk"
+    }
 }

library/src/main/java/cloud/pace/sdk/appkit/app/webview/AppWebView.kt

@@ -8,13 +8,11 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebView.setWebContentsDebuggingEnabled
 import android.widget.RelativeLayout
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
+import androidx.lifecycle.findViewTreeLifecycleOwner
 import cloud.pace.sdk.R
 import cloud.pace.sdk.appkit.AppKit
 import cloud.pace.sdk.appkit.communication.generated.CommunicationManager
-import cloud.pace.sdk.appkit.communication.generated.model.request.*
-import cloud.pace.sdk.appkit.communication.generated.model.response.*
 import cloud.pace.sdk.appkit.utils.BiometricUtils
 import cloud.pace.sdk.utils.CloudSDKKoinComponent
 import cloud.pace.sdk.utils.Event
@@ -41,6 +39,10 @@ class AppWebView(context: Context, attributeSet: AttributeSet) : RelativeLayout(
         loadUrl(url)
     }
 
+    private val loadUrlObserver = Observer<Event<String>> {
+        val url = it.getContentIfNotHandled() ?: return@Observer
+        loadUrl(url)
+    }
     private val isInErrorStateObserver = Observer<Event<Boolean>> {
         val isInErrorState = it.getContentIfNotHandled() ?: return@Observer
 
@@ -140,11 +142,10 @@ class AppWebView(context: Context, attributeSet: AttributeSet) : RelativeLayout(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        val lifecycleOwner = context as? LifecycleOwner
-            ?: throw RuntimeException("lifecycle owner not found ")
 
-        // TODO: should this be moved to "onResume" and "onPause" and replaced with "observeForever"?
+        val lifecycleOwner = findViewTreeLifecycleOwner() ?: throw RuntimeException("lifecycle owner not found ")
         webViewModel.init.observe(lifecycleOwner, initObserver)
+        webViewModel.loadUrl.observe(lifecycleOwner, loadUrlObserver)
         webViewModel.isInErrorState.observe(lifecycleOwner, isInErrorStateObserver)
         webViewModel.showLoadingIndicator.observe(lifecycleOwner, showLoadingIndicatorObserver)
         webViewModel.biometricRequest.observe(lifecycleOwner, biometricRequestObserver)

library/src/main/java/cloud/pace/sdk/appkit/app/webview/AppWebViewModel.kt

@@ -40,6 +40,7 @@ abstract class AppWebViewModel : ViewModel(), AppWebViewClient.WebClientCallback
 
     abstract val currentUrl: MutableLiveData<String?>
     abstract val init: LiveData<Event<String>>
+    abstract val loadUrl: LiveData<Event<String>>
     abstract val isInErrorState: LiveData<Event<Boolean>>
     abstract val showLoadingIndicator: LiveData<Event<Boolean>>
     abstract val biometricRequest: LiveData<Event<BiometricRequest>>
@@ -68,13 +69,14 @@ class AppWebViewModelImpl(
 
     override val currentUrl = MutableLiveData<String?>()
     override val init = MutableLiveData<Event<String>>()
+    override val loadUrl = MutableLiveData<Event<String>>()
     override val isInErrorState = MutableLiveData<Event<Boolean>>()
     override val showLoadingIndicator = MutableLiveData<Event<Boolean>>()
     override val biometricRequest = MutableLiveData<Event<BiometricRequest>>()
     override val goBack = MutableLiveData<Event<Unit>>()
 
     override fun init(url: String) {
-        this.init.value = Event(url)
+        init.value = Event(url)
     }
 
     override fun closeApp() {
@@ -380,18 +382,25 @@ class AppWebViewModelImpl(
             OpenURLInNewTabResult(OpenURLInNewTabResult.Failure(OpenURLInNewTabResult.Failure.StatusCode.RequestTimeout, OpenURLInNewTabError("Timeout for openURLInNewTab"))),
             OpenURLInNewTabResult(OpenURLInNewTabResult.Failure(OpenURLInNewTabResult.Failure.StatusCode.InternalServerError, OpenURLInNewTabError("An error occurred")))
         ) {
-            val redirectScheme = DeviceUtils.getPACERedirectScheme(context)
-            if (!redirectScheme.isNullOrEmpty()) {
+            // If integrated is true, do not check if PACE redirect scheme is set but always load the URL in the WebViewActivity
+            if (openURLInNewTabRequest.integrated == true) {
                 appModel.openUrlInNewTab(openURLInNewTabRequest)
                 OpenURLInNewTabResult(OpenURLInNewTabResult.Success())
             } else {
-                appModel.onCustomSchemeError(context, "${redirectScheme}://redirect")
-                OpenURLInNewTabResult(
-                    OpenURLInNewTabResult.Failure(
-                        OpenURLInNewTabResult.Failure.StatusCode.MethodNotAllowed,
-                        OpenURLInNewTabError("Redirect scheme for deep linking has not been specified.")
+                val redirectScheme = DeviceUtils.getPACERedirectScheme(context)
+                if (!redirectScheme.isNullOrEmpty()) {
+                    appModel.openUrlInNewTab(openURLInNewTabRequest)
+                    OpenURLInNewTabResult(OpenURLInNewTabResult.Success())
+                } else {
+                    appModel.onCustomSchemeError(context, "${redirectScheme}://redirect")
+                    loadUrl.postValue(Event(openURLInNewTabRequest.cancelUrl))
+                    OpenURLInNewTabResult(
+                        OpenURLInNewTabResult.Failure(
+                            OpenURLInNewTabResult.Failure.StatusCode.MethodNotAllowed,
+                            OpenURLInNewTabError("Redirect scheme for deep linking has not been specified.")
+                        )
                     )
-                )
+                }
             }
         }
     }