Merge pull request #40 from urbanairship/release-21.3.0

crow · web-flow · commit a2e5d4f5ecf4 · 2026-03-20T21:55:08.000-07:00
Release 21.3.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Airship DotNet Changelog
 
+## Version 21.3.0 - March 20, 2026
+Minor release that updates the iOS SDK to 20.6.0 and Android SDK to 20.4.0, adding Native Message Center support, Scene improvements, and fixing deep links in Message Center messages on iOS.
+
+### Changes
+- Updated iOS SDK to 20.6.0
+- Updated Android SDK to 20.4.0
+- Fixed deep links inside Message Center messages not working on iOS
+- Adjusted Markdown rendering in Scenes to be less aggressive when interpreting styling delimiters inside words
+- Improved Scene border rendering when rounded corners are present
+- Improved accessibility for single choice and multiple choice questions in Scenes (iOS)
+- Fixed Message Center unread indicator to only show for unread messages (iOS)
+
 ## Version 21.2.0 - January 30, 2026
 Minor release that adds programmatic deep link handling for iOS.
 
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "urbanairship/ios-library" == 20.3.0
+github "urbanairship/ios-library" == 20.6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "urbanairship/ios-library" "20.3.0"
+github "urbanairship/ios-library" "20.6.0"
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,15 +5,15 @@
   <!-- Versions -->
   <PropertyGroup>
     <!-- Airship native SDK versions -->
-    <AirshipAndroidVersion>20.2.0</AirshipAndroidVersion>
-    <AirshipAndroidNugetVersion>20.2.0</AirshipAndroidNugetVersion>
+    <AirshipAndroidVersion>20.4.0</AirshipAndroidVersion>
+    <AirshipAndroidNugetVersion>20.4.0</AirshipAndroidNugetVersion>
 
-    <AirshipIosVersion>20.3.0</AirshipIosVersion>
-    <AirshipIosNugetVersion>20.3.0</AirshipIosNugetVersion>
+    <AirshipIosVersion>20.6.0</AirshipIosVersion>
+    <AirshipIosNugetVersion>20.6.0</AirshipIosNugetVersion>
 
     <!-- Airship.Net version -->
-    <AirshipCrossPlatformVersion>21.2.0</AirshipCrossPlatformVersion>
-    <AirshipCrossPlatformNugetVersion>21.2.0</AirshipCrossPlatformNugetVersion>
+    <AirshipCrossPlatformVersion>21.3.0</AirshipCrossPlatformVersion>
+    <AirshipCrossPlatformNugetVersion>21.3.0</AirshipCrossPlatformNugetVersion>
   </PropertyGroup>
 
   <!-- Nuget packaging metadata -->
diff --git a/MauiSample/run-ios.sh b/MauiSample/run-ios.sh
@@ -26,8 +26,12 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_DIR="$SCRIPT_DIR"
 REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
-# Ensure .NET is in PATH
-export PATH="$HOME/.dotnet:$PATH"
+# Ensure .NET is in PATH (prefer arm64 build if available)
+if [[ -f "$HOME/.dotnet10arm64/dotnet" ]]; then
+    export PATH="$HOME/.dotnet10arm64:$PATH"
+else
+    export PATH="$HOME/.dotnet:$PATH"
+fi
 
 # Check if dotnet is available
 if ! command -v dotnet &> /dev/null; then
diff --git a/airship.properties b/airship.properties
@@ -1,12 +1,12 @@
 # Airship native SDK versions
-iosVersion = 20.3.0
-androidVersion = 20.2.0
+iosVersion = 20.6.0
+androidVersion = 20.4.0
 
 # Airship.Net cross-platform version
-crossPlatformVersion = 21.2.0
+crossPlatformVersion = 21.3.0
 
 # Filename of the iOS SDK zip file
-iosFrameworkZip = Airship-iOS-SDK-20.3.0.zip
+iosFrameworkZip = Airship-iOS-SDK-20.6.0.zip
 
 # NuGet package revision numbers
 # If > 0, the revision number will be added to the versions
diff --git a/binderator/config.json b/binderator/config.json
@@ -17,88 +17,88 @@
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-adm",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.Adm",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-automation",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.Automation",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-core",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.Core",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-fcm",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.Fcm",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-feature-flag",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.FeatureFlag",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-layout",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.Layout",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-live-update",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.LiveUpdate",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-message-center",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.MessageCenter",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-message-center-core",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.MessageCenterCore",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-preference-center",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.PreferenceCenter",
         "dependencyOnly": false
       },
       {
         "groupId": "com.urbanairship.android",
         "artifactId": "urbanairship-preference-center-core",
-        "version": "20.2.0",
-        "nugetVersion": "20.2.0",
+        "version": "20.4.0",
+        "nugetVersion": "20.4.0",
         "nugetId": "Airship.Net.Android.PreferenceCenterCore",
         "dependencyOnly": false
       },
@@ -342,6 +342,14 @@
         "nugetId": "Xamarin.Firebase.Messaging",
         "dependencyOnly": true
       },
+      {
+        "groupId": "org.jetbrains.kotlin",
+        "artifactId": "kotlin-parcelize-runtime",
+        "version": "2.2.20",
+        "nugetVersion": "2.2.21",
+        "nugetId": "Xamarin.Kotlin.StdLib",
+        "dependencyOnly": true
+      },
       {
         "groupId": "org.jetbrains.kotlin",
         "artifactId": "kotlin-stdlib",
diff --git a/binderator/source/com.urbanairship.android/urbanairship-message-center-core/Transforms/Metadata.xml b/binderator/source/com.urbanairship.android/urbanairship-message-center-core/Transforms/Metadata.xml
@@ -11,6 +11,21 @@
     <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
     <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
 
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.AssociatedData.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.AssociatedData.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
+
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.AssociatedData.ViewState.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.AssociatedData.ViewState.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
+
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.ContentType.Html.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.ContentType.Html.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
+
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.ContentType.Native.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.ContentType.Native.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
+
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.ContentType.Plain.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
+    <attr path="/api/package[@name='com.urbanairship.messagecenter']/class[@name='Message.ContentType.Plain.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
+
     <attr path="/api/package[@name='com.urbanairship.messagecenter.ui.view']/class[@name='MessageListState.Content.Creator']/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
     <attr path="/api/package[@name='com.urbanairship.messagecenter.ui.view']/class[@name='MessageListState.Content.Creator']/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
 
diff --git a/src/Airship.Net.MessageCenter/Controls/Platforms/iOS/MessageViewHandler.cs b/src/Airship.Net.MessageCenter/Controls/Platforms/iOS/MessageViewHandler.cs
@@ -14,6 +14,7 @@ public partial class MessageViewHandler : ViewHandler<MessageView, UIView>
         private UIView _containerView = null!;
         private WKWebView _webView = null!;
         private NSObject? _webViewObserver;
+        private UAMessageCenterNativeBridge _nativeBridge = null!;
 
         public MessageViewHandler() : base(PropertyMapper, CommandMapper)
         {
@@ -27,16 +28,19 @@ protected override UIView CreatePlatformView()
         {
             _containerView = new UIView();
             _containerView.BackgroundColor = UIColor.SystemBackground;
-            
+
             // Create web view with configuration
             var config = new WKWebViewConfiguration();
             config.WebsiteDataStore = WKWebsiteDataStore.DefaultDataStore;
             config.Preferences.JavaScriptEnabled = true;
-            
+
             _webView = new WKWebView(_containerView.Bounds, config);
             _webView.AutoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleHeight;
-            _webView.NavigationDelegate = new MessageWebViewDelegate(this);
-            
+
+            _nativeBridge = new UAMessageCenterNativeBridge();
+            _nativeBridge.ForwardNavigationDelegate = new MessageWebViewDelegate(this);
+            _webView.WeakNavigationDelegate = _nativeBridge.NavigationDelegate;
+
             _containerView.AddSubview(_webView);
             
             return _containerView;
@@ -59,7 +63,10 @@ protected override void DisconnectHandler(UIView platformView)
                 _webViewObserver.Dispose();
                 _webViewObserver = null;
             }
-            
+
+            _nativeBridge?.Dispose();
+            _nativeBridge = null!;
+
             _webView?.RemoveFromSuperview();
             _webView?.Dispose();
             _webView = null;
@@ -101,22 +108,21 @@ private void LoadMessage(string messageId)
                             var bodyUrl = message.BodyURL;
                             if (bodyUrl != null)
                             {
-                                // Get authentication credentials
-                                AWAirshipWrapper.GetMessageCenterUserAuth((authString) =>
+                                // Get user for native bridge and auth
+                                AWAirshipWrapper.Shared.MessageCenter.Inbox.GetUserWithCompletionHandler((user) =>
                                 {
                                     NSRunLoop.Main.InvokeOnMainThread(() =>
                                     {
-                                        if (authString != null)
+                                        if (user != null)
                                         {
-                                            // Create request with authentication header
+                                            _nativeBridge.SetMessage(message, user);
                                             var mutableRequest = new NSMutableUrlRequest(bodyUrl);
-                                            // The authString from basicAuthString already includes "Basic " prefix
-                                            mutableRequest["Authorization"] = authString;
+                                            mutableRequest["Authorization"] = user.BasicAuthString;
                                             _webView.LoadRequest(mutableRequest);
                                         }
                                         else
                                         {
-                                            // Fallback to loading without auth if auth retrieval fails
+                                            // Fallback to loading without auth if user retrieval fails
                                             var request = new NSUrlRequest(bodyUrl);
                                             _webView.LoadRequest(request);
                                         }
@@ -163,6 +169,21 @@ public void DidFailProvisionalNavigation(WKWebView webView, WKNavigation navigat
             {
                 _handler.VirtualView?.SendLoadFailed(error.LocalizedDescription);
             }
+
+            [Export("webView:decidePolicyForNavigationAction:decisionHandler:")]
+            public void DecidePolicy(WKWebView webView, WKNavigationAction navigationAction, Action<WKNavigationActionPolicy> decisionHandler)
+            {
+                var url = navigationAction.Request.Url;
+                if (url != null && url.Scheme != "http" && url.Scheme != "https")
+                {
+                    decisionHandler(WKNavigationActionPolicy.Cancel);
+                    UAirship.ProcessDeepLink(url, (_) => { });
+                }
+                else
+                {
+                    decisionHandler(WKNavigationActionPolicy.Allow);
+                }
+            }
         }
     }
 }
diff --git a/src/Airship.Net/Platforms/Android/Airship.cs b/src/Airship.Net/Platforms/Android/Airship.cs
@@ -159,7 +159,7 @@ public event EventHandler<MessageCenterEventArgs> OnMessageCenterDisplay
         /// <summary>
         /// Gets the Airship .NET library version.
         /// </summary>
-        public static string Version => "21.2.0";
+        public static string Version => "21.3.0";
 
         // Module properties
         public static IAirshipPush Push => Instance._push;
diff --git a/src/Airship.Net/Platforms/iOS/Airship.cs b/src/Airship.Net/Platforms/iOS/Airship.cs
@@ -197,7 +197,7 @@ public event EventHandler<MessageCenterEventArgs> OnMessageCenterDisplay
         /// <summary>
         /// Gets the Airship .NET library version.
         /// </summary>
-        public static string Version => "21.2.0";
+        public static string Version => "21.3.0";
 
         // Module properties
         public static IAirshipPush Push => Instance._push;
diff --git a/src/AirshipBindings.iOS.ObjectiveC/ApiDefinitions.cs b/src/AirshipBindings.iOS.ObjectiveC/ApiDefinitions.cs
@@ -1347,6 +1347,36 @@ interface UAMessageCenterUser
 		string BasicAuthString { get; }
 	}
 
+	// @protocol UAMessageCenterNativeBridgeDelegate
+	[Protocol (Name = "_TtP17AirshipObjectiveC35UAMessageCenterNativeBridgeDelegate_"), Model]
+	[BaseType (typeof(NSObject))]
+	interface UAMessageCenterNativeBridgeDelegate
+	{
+		[Abstract]
+		[Export ("close")]
+		void Close ();
+	}
+
+	// @interface UAMessageCenterNativeBridge : NSObject
+	[BaseType (typeof(NSObject), Name = "_TtC17AirshipObjectiveC27UAMessageCenterNativeBridge")]
+	interface UAMessageCenterNativeBridge
+	{
+		// navigationDelegate is bound as NSObject because Swift's `any WKNavigationDelegate`
+		// produces WKNavigationDelegateWrapper in .NET (not an NSObject), so we use
+		// WKWebView.WeakNavigationDelegate instead of NavigationDelegate.
+		[Export ("navigationDelegate", ArgumentSemantic.Strong)]
+		NSObject NavigationDelegate { get; }
+
+		[NullAllowed, Export ("nativeBridgeDelegate", ArgumentSemantic.Weak)]
+		UAMessageCenterNativeBridgeDelegate NativeBridgeDelegate { get; set; }
+
+		[NullAllowed, Export ("forwardNavigationDelegate", ArgumentSemantic.Strong)]
+		WebKit.IWKNavigationDelegate ForwardNavigationDelegate { get; set; }
+
+		[Export ("setMessage:user:")]
+		void SetMessage (UAMessageCenterMessage message, UAMessageCenterUser user);
+	}
+
 	// @interface UAMessageCenterViewControllerFactory : NSObject
 	[BaseType (typeof(NSObject), Name = "_TtC17AirshipObjectiveC36UAMessageCenterViewControllerFactory")]
 	interface UAMessageCenterViewControllerFactory
diff --git a/src/SharedAssemblyInfo.Common.cs b/src/SharedAssemblyInfo.Common.cs
@@ -6,4 +6,4 @@
 // Change them to the values specific to your project.
 
 // Cross-platform version of the plugin
-[assembly: UACrossPlatformVersion ("21.2.0")]
+[assembly: UACrossPlatformVersion ("21.3.0")]
diff --git a/src/SharedAssemblyInfo.CrossPlatform.cs b/src/SharedAssemblyInfo.CrossPlatform.cs
@@ -12,5 +12,5 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("21.2.0")]
+[assembly: AssemblyVersion ("21.3.0")]
 
diff --git a/src/SharedAssemblyInfo.iOS.cs b/src/SharedAssemblyInfo.iOS.cs
@@ -17,4 +17,4 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("21.2.0")]
+[assembly: AssemblyVersion ("21.3.0")]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "urbanairship/ios-library" == 20.3.0`
	`1`	`+github "urbanairship/ios-library" == 20.6.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "urbanairship/ios-library" "20.3.0"`
	`1`	`+github "urbanairship/ios-library" "20.6.0"`