Merge pull request #119 from adobe/dev-v3.x

Merge `dev-v3.x` into `staging` for Assurance v3.0.1

.github/workflows/update-testapp.yml

@@ -12,10 +12,12 @@ jobs:
     runs-on: macos-latest
 
     steps:
+
     - name: Set up Java
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 11
+        distribution: 'zulu'
+        java-version: 17
 
     - name: Checkout
       uses: actions/[email protected]

code/assurance-testapp/build.gradle.kts

@@ -86,15 +86,9 @@ android {
         implementation("com.adobe.marketing.mobile:lifecycle:3.0.0")
         // Messaging, Edge, and EdgeIdentity will be available after Core, Assurance release.
         // Use Snapshot version for initial Assurance release.
-        implementation("com.adobe.marketing.mobile:messaging:3.0.0-beta.1-SNAPSHOT") {
-            isTransitive = false
-        }
-        implementation("com.adobe.marketing.mobile:edge:3.0.0-beta.1-SNAPSHOT") {
-            isTransitive = false
-        }
-        implementation("com.adobe.marketing.mobile:edgeidentity:3.0.0-beta.1-SNAPSHOT") {
-            isTransitive = false
-        }
+        implementation("com.adobe.marketing.mobile:messaging:3.0.0")
+        implementation("com.adobe.marketing.mobile:edge:3.0.0")
+        implementation("com.adobe.marketing.mobile:edgeidentity:3.0.0")
 
         testImplementation("junit:junit:4.13.2")
 

code/assurance/src/main/java/com/adobe/marketing/mobile/Assurance.java

@@ -22,7 +22,7 @@ public class Assurance {
 
     public static final Class<? extends Extension> EXTENSION = AssuranceExtension.class;
     public static final String LOG_TAG = "Assurance";
-    public static final String EXTENSION_VERSION = "3.0.0";
+    public static final String EXTENSION_VERSION = "3.0.1";
     public static final String EXTENSION_NAME = "com.adobe.assurance";
     public static final String EXTENSION_FRIENDLY_NAME = "Assurance";
 

code/assurance/src/main/java/com/adobe/marketing/mobile/assurance/internal/AssuranceSessionPresentationManager.kt

@@ -65,12 +65,17 @@ internal class AssuranceSessionPresentationManager {
     /** Shows the UI elements that are required when a session connection has been disconnected.  */
     @JvmName("onSessionDisconnected")
     internal fun onSessionDisconnected(closeCode: Int) {
+        // Remove the button from the UI on any disconnection. This is OK since
+        // 1. The button will be  re-added when the session is connected via (onSessionConnected) or
+        //    re-connected (onSessionReconnecting) again after an error.
+        // 2. The button is not shown anyway when the Assurance Authorization UI is active.
+        button.remove()
+
         val error = SocketCloseCode.toAssuranceConnectionError(closeCode)
         if (error == null) {
             AssuranceComponentRegistry.appState.onSessionPhaseChange(
                 AssuranceAppState.SessionPhase.Disconnected()
             )
-            button.remove()
             logLocalUI(
                 UILogColorVisibility.LOW,
                 "Assurance disconnected."
@@ -96,7 +101,11 @@ internal class AssuranceSessionPresentationManager {
      */
     @JvmName("onSessionReconnecting")
     internal fun onSessionReconnecting() {
-        button.updateGraphic(false)
+        button.apply {
+            show()
+            updateGraphic(connected = false)
+        }
+
         logLocalUI(
             UILogColorVisibility.HIGH,
             "Assurance disconnected, attempting to reconnect ..."

code/assurance/src/main/java/com/adobe/marketing/mobile/assurance/internal/AssuranceWebViewSocket.java

@@ -19,6 +19,7 @@
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import com.adobe.marketing.mobile.Assurance;
@@ -228,7 +229,10 @@ public void run() {
                                     webView == null
                                             ? new WebView(MobileCore.getApplication())
                                             : webView;
-                            currentSocket.webView.getSettings().setJavaScriptEnabled(true);
+                            final WebSettings webSettings = currentSocket.webView.getSettings();
+                            webSettings.setJavaScriptEnabled(true);
+                            webSettings.setAllowContentAccess(false);
+                            webSettings.setAllowFileAccess(false);
                             currentSocket.webView.setWebViewClient(new WebViewSocketClient());
                             currentSocket.webView.setWebChromeClient(
                                     new WebChromeClient() {

code/assurance/src/main/java/com/adobe/marketing/mobile/assurance/internal/ui/quickconnect/QuickConnectViewModel.kt

@@ -134,6 +134,7 @@ internal class QuickConnectViewModel : ViewModel {
         when (quickConnectScreenAction) {
             is QuickConnectScreenAction.Cancel -> {
                 _state.value = ConnectionState.Disconnected(null)
+                quickConnectManager.cancel()
                 AssuranceComponentRegistry.sessionUIOperationHandler?.onCancel()
             }
 

code/assurance/src/test/java/com/adobe/marketing/mobile/assurance/internal/AssuranceSessionPresentationManagerTest.kt

@@ -124,14 +124,16 @@ class AssuranceSessionPresentationManagerTest {
 
         // Verify
 
+        // Floating button should be removed on disconnection
+        verify(mockAssuranceFloatingButton).remove()
+
         // Session phase should remain in Authorizing phase because the UI is active
         assertEquals(
             AssuranceAppState.SessionPhase.Authorizing(credentials),
             AssuranceComponentRegistry.appState.sessionPhase.value
         )
 
         // no changes in ui elements
-        verify(mockAssuranceFloatingButton, never()).remove()
         verify(mockActivity, never()).startActivity(any())
     }
 
@@ -210,6 +212,7 @@ class AssuranceSessionPresentationManagerTest {
         assuranceSessionPresentationManager.onSessionReconnecting()
 
         // Verify
+        verify(mockAssuranceFloatingButton).show()
         verify(mockAssuranceFloatingButton).updateGraphic(false)
         val currentPhase = AssuranceComponentRegistry.appState.sessionPhase.value
         assertTrue { currentPhase is AssuranceAppState.SessionPhase.Disconnected }

code/assurance/src/test/java/com/adobe/marketing/mobile/assurance/internal/ui/quickconnect/QuickConnectViewModelTest.kt

@@ -91,6 +91,7 @@ class QuickConnectViewModelTest {
             ConnectionState.Disconnected(null),
             quickConnectViewModel.state.value
         )
+        verify(mockQuickConnectManager).cancel()
         verify(mockSessionUIOperationHandler).onCancel()
     }
 

code/gradle.properties

@@ -14,7 +14,7 @@ android.injected.testOnly = false
 org.gradle.configureondemand=false
 
 moduleName=assurance
-moduleVersion=3.0.0
+moduleVersion=3.0.1
 mavenRepoName=AdobeMobileAssurance
 mavenRepoDescription=Android Assurance Extension for Adobe Mobile Marketing
 mavenCoreVersion=3.0.0