Merge branch 'main' into rehan/push-click-behavior

customerio · Oct 18, 2023 · 72a0535 · 72a0535
2 parents dee8f95 + d17fab9
commit 72a0535
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.6.7](https://github.com/customerio/customerio-android/compare/3.6.6...3.6.7) (2023-10-17)
+
+
+### Bug Fixes
+
+* added exception handling for when browser doesn't exist ([#271](https://github.com/customerio/customerio-android/issues/271)) ([aaddad5](https://github.com/customerio/customerio-android/commit/aaddad53281ac22c1e8a73340fcb24e7522e4648))
+
 ### [3.6.6](https://github.com/customerio/customerio-android/compare/3.6.5...3.6.6) (2023-09-15)
 
 

diff --git a/...ginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt b/...ginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt
@@ -25,11 +25,17 @@ internal class EngineWebView @JvmOverloads constructor(
     var listener: EngineWebViewListener? = null
     private var timer: Timer? = null
     private var timerTask: TimerTask? = null
-    private var webView: WebView = WebView(context)
+    private var webView: WebView? = null
     private var elapsedTimer: ElapsedTimer = ElapsedTimer()
 
     init {
-        this.addView(webView)
+        // exception handling is required for webview in-case webview is not supported in the device
+        try {
+            webView = WebView(context)
+            this.addView(webView)
+        } catch (e: Exception) {
+            Log.e(GIST_TAG, "Error while creating EngineWebView: ${e.message}")
+        }
     }
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -38,40 +44,60 @@ internal class EngineWebView @JvmOverloads constructor(
         val jsonString = Gson().toJson(configuration)
         encodeToBase64(jsonString)?.let { options ->
             elapsedTimer.start("Engine render for message: ${configuration.messageId}")
-            val messageUrl = "${GistSdk.gistEnvironment.getGistRendererUrl()}/index.html?options=$options"
+            val messageUrl =
+                "${GistSdk.gistEnvironment.getGistRendererUrl()}/index.html?options=$options"
             Log.i(GIST_TAG, "Rendering message with URL: $messageUrl")
-            webView.loadUrl(messageUrl)
-            webView.settings.javaScriptEnabled = true
-            webView.settings.allowFileAccess = true
-            webView.settings.allowContentAccess = true
-            webView.settings.domStorageEnabled = true
-            webView.settings.textZoom = 100
-            webView.setBackgroundColor(Color.TRANSPARENT)
-            webView.addJavascriptInterface(EngineWebViewInterface(this), "appInterface")
-
-            webView.webViewClient = object : WebViewClient() {
-                override fun onPageFinished(view: WebView, url: String?) {
-                    view.loadUrl("javascript:window.parent.postMessage = function(message) {window.appInterface.postMessage(JSON.stringify(message))}")
-                }
-
-                override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-                    return !url.startsWith("https://code.gist.build")
-                }
-
-                override fun onReceivedError(view: WebView?, errorCod: Int, description: String, failingUrl: String?) {
-                    listener?.error()
-                }
-
-                override fun onReceivedHttpError(view: WebView?, request: WebResourceRequest?, errorResponse: WebResourceResponse?) {
-                    listener?.error()
-                }
-
-                override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
-                    listener?.error()
-                }
-
-                override fun onReceivedSslError(view: WebView?, handler: SslErrorHandler?, error: SslError?) {
-                    listener?.error()
+            webView?.let {
+                it.loadUrl(messageUrl)
+                it.settings.javaScriptEnabled = true
+                it.settings.allowFileAccess = true
+                it.settings.allowContentAccess = true
+                it.settings.domStorageEnabled = true
+                it.settings.textZoom = 100
+                it.setBackgroundColor(Color.TRANSPARENT)
+                it.addJavascriptInterface(EngineWebViewInterface(this), "appInterface")
+
+                it.webViewClient = object : WebViewClient() {
+                    override fun onPageFinished(view: WebView, url: String?) {
+                        view.loadUrl("javascript:window.parent.postMessage = function(message) {window.appInterface.postMessage(JSON.stringify(message))}")
+                    }
+
+                    override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                        return !url.startsWith("https://code.gist.build")
+                    }
+
+                    override fun onReceivedError(
+                        view: WebView?,
+                        errorCod: Int,
+                        description: String,
+                        failingUrl: String?
+                    ) {
+                        listener?.error()
+                    }
+
+                    override fun onReceivedHttpError(
+                        view: WebView?,
+                        request: WebResourceRequest?,
+                        errorResponse: WebResourceResponse?
+                    ) {
+                        listener?.error()
+                    }
+
+                    override fun onReceivedError(
+                        view: WebView?,
+                        request: WebResourceRequest?,
+                        error: WebResourceError?
+                    ) {
+                        listener?.error()
+                    }
+
+                    override fun onReceivedSslError(
+                        view: WebView?,
+                        handler: SslErrorHandler?,
+                        error: SslError?
+                    ) {
+                        listener?.error()
+                    }
                 }
             }
         } ?: run {

diff --git a/sdk/src/main/java/io/customer/sdk/Version.kt b/sdk/src/main/java/io/customer/sdk/Version.kt
@@ -7,5 +7,5 @@ package io.customer.sdk
 
 internal object Version {
 
-    const val version: String = "3.6.6"
+    const val version: String = "3.6.7"
 }