release: 0.0.7

.github/workflows/main.yml

@@ -35,9 +35,6 @@ jobs:
         script: ./gradlew :messenger:connectedAndroidTest
 
     - name: Gradle Build and Test
-      uses: eskatos/gradle-command-action@v1.3.3
+      uses: gradle/gradle-build-action@v2
       with:
-        wrapper-cache-enabled: true
-        dependencies-cache-enabled: true
-        configuration-cache-enabled: true
         arguments: clean assembleDebug testDebugUnitTest --info --stacktrace

README.md

@@ -42,7 +42,7 @@ dependencies {
 
 ## Manual installation
 
-[Download](https://jitpack.io/com/github/deskpro/messenger-sdk-android/0.0.6/messenger-sdk-android-0.0.6.aar) latest .aar file
+[Download](https://jitpack.io/com/github/deskpro/messenger-sdk-android/0.0.7/messenger-sdk-android-0.0.7.aar) latest .aar file
 
 - Open the build.gradle file for the app module and add the following lines:
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Dec 28 22:40:57 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

messenger/src/main/java/com/deskpro/messenger/ui/MessengerWebViewActivity.kt

@@ -24,6 +24,8 @@ import com.deskpro.messenger.util.extensions.EvaluateScriptsUtil.initAndOpenScri
 import com.deskpro.messenger.util.extensions.extractAppId
 import com.deskpro.messenger.util.extensions.extractUrl
 import timber.log.Timber
+import java.net.MalformedURLException
+import java.net.URL
 
 /**
  * Activity hosting the WebView for DeskPro Messenger functionality.
@@ -115,8 +117,16 @@ internal class MessengerWebViewActivity : AppCompatActivity() {
                     error: WebResourceError?
                 ) {
                     super.onReceivedError(view, request, error)
-                    binding.progressBar.visibility = View.GONE
-                    loadErrorHtmlPage()
+                    // Only redirect to error page if the error came from the Messenger domain
+                    try {
+                        if (URL(url).host == request?.url?.host) {
+                            binding.progressBar.visibility = View.GONE
+                            loadErrorHtmlPage()
+                        }
+                    } catch (e: MalformedURLException) {
+                        // If url is malformed then Messenger has failed to load
+                        loadErrorHtmlPage()
+                    }
                 }
             }
         }