fix(demo): fix stale Android click targets and IAM WebView debugging

Author: fadi-george

examples/demo/Assets/Scripts/AppBootstrapper.cs

@@ -58,6 +58,9 @@ private async void Start()
             _apiService.SetAppId(appId);
 
             OneSignal.Debug.LogLevel = LogLevel.Verbose;
+#if UNITY_ANDROID && !UNITY_EDITOR
+            SetAndroidWebViewDebugging(false);
+#endif
             OneSignal.ConsentRequired = _prefs.ConsentRequired;
             OneSignal.ConsentGiven = _prefs.PrivacyConsent;
             OneSignal.Initialize(appId);
@@ -114,6 +117,42 @@ private static void RequestAndroidPostNotificationsPermission()
                 1001
             );
         }
+
+        private static void SetAndroidWebViewDebugging(bool enabled)
+        {
+            if (!DotEnv.IsE2EMode)
+                return;
+
+            try
+            {
+                using var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+                using var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
+                if (activity == null)
+                    return;
+
+                activity.Call(
+                    "runOnUiThread",
+                    new AndroidJavaRunnable(() =>
+                    {
+                        try
+                        {
+                            using var webView = new AndroidJavaClass("android.webkit.WebView");
+                            webView.CallStatic("setWebContentsDebuggingEnabled", enabled);
+                        }
+                        catch (AndroidJavaException ex)
+                        {
+                            Debug.LogWarning(
+                                $"[{Tag}] Could not set WebView debugging: {ex.Message}"
+                            );
+                        }
+                    })
+                );
+            }
+            catch (AndroidJavaException ex)
+            {
+                Debug.LogWarning($"[{Tag}] Could not set WebView debugging: {ex.Message}");
+            }
+        }
 #endif
 
         private void RegisterSdkListeners()
@@ -141,17 +180,27 @@ private void OnDestroy()
             OneSignal.Notifications.ForegroundWillDisplay -= OnNotificationForegroundWillDisplay;
         }
 
-        private void OnIamWillDisplay(object sender, InAppMessageWillDisplayEventArgs e) =>
+        private void OnIamWillDisplay(object sender, InAppMessageWillDisplayEventArgs e)
+        {
+#if UNITY_ANDROID && !UNITY_EDITOR
+            SetAndroidWebViewDebugging(true);
+#endif
             Debug.Log($"[{Tag}] IAM will display: {e.Message.MessageId}");
+        }
 
         private void OnIamDidDisplay(object sender, InAppMessageDidDisplayEventArgs e) =>
             Debug.Log($"[{Tag}] IAM did display: {e.Message.MessageId}");
 
         private void OnIamWillDismiss(object sender, InAppMessageWillDismissEventArgs e) =>
             Debug.Log($"[{Tag}] IAM will dismiss: {e.Message.MessageId}");
 
-        private void OnIamDidDismiss(object sender, InAppMessageDidDismissEventArgs e) =>
+        private void OnIamDidDismiss(object sender, InAppMessageDidDismissEventArgs e)
+        {
             Debug.Log($"[{Tag}] IAM did dismiss: {e.Message.MessageId}");
+#if UNITY_ANDROID && !UNITY_EDITOR
+            SetAndroidWebViewDebugging(false);
+#endif
+        }
 
         private void OnIamClicked(object sender, InAppMessageClickEventArgs e) =>
             Debug.Log($"[{Tag}] IAM clicked: {e.Result.ActionId}");

examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs

@@ -189,6 +189,7 @@ Action action
                 isEnabled ?? (() => true),
                 action
             );
+            target.RegisterCallback<DetachFromPanelEvent>(OnAndroidClickTargetDetached);
 #elif UNITY_IOS && !UNITY_EDITOR
             if (target == null || action == null || string.IsNullOrEmpty(target.name))
                 return;
@@ -201,6 +202,14 @@ Action action
 #endif
         }
 
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static void OnAndroidClickTargetDetached(DetachFromPanelEvent e)
+        {
+            if (e.target is VisualElement target)
+                AndroidClickTargets.Remove(target);
+        }
+#endif
+
         public static void RequestResync()
         {
             _instance?.ScheduleResync();
@@ -652,14 +661,41 @@ private void InvokeAndroidNativeAction(string id)
                 return;
             }
 
+            Action actionToInvoke = null;
+            List<VisualElement> detachedTargets = null;
             foreach (var kvp in AndroidClickTargets)
             {
                 var el = kvp.Key;
-                if (el == null || el.name != id || !kvp.Value.IsEnabled())
+                if (el == null || el.panel == null || !IsDescendantOfRoot(el))
+                {
+                    if (el != null)
+                    {
+                        detachedTargets ??= new List<VisualElement>();
+                        detachedTargets.Add(el);
+                    }
                     continue;
-                kvp.Value.Action();
-                return;
+                }
+                if (el.name != id || !IsVisible(el) || !kvp.Value.IsEnabled())
+                    continue;
+                actionToInvoke = kvp.Value.Action;
+                break;
+            }
+            if (detachedTargets != null)
+            {
+                foreach (var target in detachedTargets)
+                    AndroidClickTargets.Remove(target);
+            }
+            actionToInvoke?.Invoke();
+        }
+
+        private bool IsDescendantOfRoot(VisualElement el)
+        {
+            for (var current = el; current != null; current = current.hierarchy.parent)
+            {
+                if (current == _root)
+                    return true;
             }
+            return false;
         }
 
         private void InvokeAndroidNativeScroll(string direction)