chore(demo): make Android channel ID configurable

chore(demo): replace en dash with em dash

fix(demo): retry on invalid_player_ids

Author: fadi-george

examples/demo/.env.example

@@ -2,3 +2,7 @@
 ONESIGNAL_APP_ID=your-onesignal-app-id
 ONESIGNAL_API_KEY=your_rest_api_key
 E2E_MODE=false
+
+# Optional: Android Notification Channel ID for the WITH SOUND test notification.
+# Create one in your OneSignal dashboard under Settings > Android Notification Categories.
+ONESIGNAL_ANDROID_CHANNEL_ID=

examples/demo/Controls/Sections/UserSection.xaml

@@ -40,7 +40,7 @@
           <Label
             Grid.Column="1"
             x:Name="ExternalIdLabel"
-            Text="–"
+            Text="—"
             Style="{StaticResource BodySmallStyle}"
             FontFamily="DroidSansMono"
             VerticalOptions="Center"

examples/demo/Services/OneSignalApiService.cs

@@ -6,6 +6,8 @@ namespace OneSignalDemo.Services;
 
 public class OneSignalApiService
 {
+    private const string DefaultAndroidChannelId = "b3b015d9-c050-4042-8548-dcc34aa44aa4";
+
     private string _appId = "";
 
     public void SetAppId(string appId) => _appId = appId;
@@ -20,6 +22,12 @@ public bool HasApiKey()
 
     private string GetApiKey() => DotEnv.Get("ONESIGNAL_API_KEY");
 
+    private static string GetAndroidChannelId()
+    {
+        var value = DotEnv.Get("ONESIGNAL_ANDROID_CHANNEL_ID")?.Trim();
+        return string.IsNullOrEmpty(value) ? DefaultAndroidChannelId : value;
+    }
+
     public async Task<bool> SendNotificationAsync(NotificationType type, string subscriptionId)
     {
         try
@@ -55,7 +63,7 @@ public async Task<bool> SendNotificationAsync(NotificationType type, string subs
                     extra = new Dictionary<string, object>
                     {
                         ["ios_sound"] = "vine_boom.wav",
-                        ["android_channel_id"] = "b3b015d9-c050-4042-8548-dcc34aa44aa4",
+                        ["android_channel_id"] = GetAndroidChannelId(),
                     };
                     break;
                 default:
@@ -111,12 +119,61 @@ private async Task<bool> SendAsync(
         }
 
         var json = JsonSerializer.Serialize(payload);
-        var content = new StringContent(json, Encoding.UTF8, "application/json");
-        var response = await client.PostAsync(
-            "https://onesignal.com/api/v1/notifications",
-            content
-        );
-        return response.IsSuccessStatusCode;
+
+        // Retry once on `invalid_player_ids` to absorb the brief race where the
+        // subscription has been created locally but is not yet visible to the
+        // /notifications endpoint.
+        for (var attempt = 0; attempt < 2; attempt++)
+        {
+            var content = new StringContent(json, Encoding.UTF8, "application/json");
+            var response = await client.PostAsync(
+                "https://onesignal.com/api/v1/notifications",
+                content
+            );
+
+            if (!response.IsSuccessStatusCode)
+                return false;
+
+            var responseJson = await response.Content.ReadAsStringAsync();
+            if (HasInvalidPlayerIds(responseJson))
+            {
+                if (attempt == 0)
+                {
+                    await Task.Delay(3000);
+                    continue;
+                }
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool HasInvalidPlayerIds(string responseJson)
+    {
+        if (string.IsNullOrWhiteSpace(responseJson))
+            return false;
+        try
+        {
+            using var doc = JsonDocument.Parse(responseJson);
+            if (
+                doc.RootElement.ValueKind == JsonValueKind.Object
+                && doc.RootElement.TryGetProperty("errors", out var errors)
+                && errors.ValueKind == JsonValueKind.Object
+                && errors.TryGetProperty("invalid_player_ids", out var invalidIds)
+                && invalidIds.ValueKind == JsonValueKind.Array
+            )
+            {
+                return invalidIds.GetArrayLength() > 0;
+            }
+        }
+        catch
+        {
+            // Ignore malformed bodies; treat as success since status was 2xx.
+        }
+        return false;
     }
 
     public async Task<UserData?> FetchUserAsync(string onesignalId)

examples/demo/ViewModels/AppViewModel.cs

@@ -29,7 +29,7 @@ public partial class AppViewModel : ObservableObject
     private string _userStatus = "Anonymous";
 
     [ObservableProperty]
-    private string _externalIdDisplay = "–";
+    private string _externalIdDisplay = "—";
 
     [ObservableProperty]
     private bool _isLoggedIn;
@@ -39,7 +39,7 @@ public partial class AppViewModel : ObservableObject
 
     // Push section
     [ObservableProperty]
-    private string _pushSubscriptionId = "";
+    private string _pushSubscriptionId = "—";
 
     [ObservableProperty]
     private bool _isPushEnabled;
@@ -106,12 +106,18 @@ public AppViewModel(PreferencesService prefs, OneSignalApiService apiService)
     }
 
     private static string MaskValue(string value) =>
-        string.IsNullOrEmpty(value) ? value : new string('\u2022', value.Length);
+        IsE2EMode && value != "—" ? new string('\u2022', value.Length) : value;
+
+    private static string MaskPushId(string? value, bool hasNotificationPermission) =>
+        hasNotificationPermission ? MaskValue(string.IsNullOrEmpty(value) ? "—" : value) : "—";
+
+    private static string FormatToken(string? value) =>
+        string.IsNullOrEmpty(value) ? "null" : $"{value[..Math.Min(8, value.Length)]}...";
 
     public async Task LoadInitialStateAsync()
     {
         var rawAppId = _apiService.GetAppId();
-        AppId = IsE2EMode ? MaskValue(rawAppId) : rawAppId;
+        AppId = MaskValue(rawAppId);
         ConsentRequired = _prefs.ConsentRequired;
         PrivacyConsentGiven = _prefs.PrivacyConsent;
         InAppMessagesPaused = OneSignal.InAppMessages.Paused;
@@ -121,8 +127,8 @@ public async Task LoadInitialStateAsync()
         var extId = OneSignal.User.ExternalId ?? _prefs.ExternalUserId;
         UpdateUserStatus(extId);
 
-        var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-        PushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+        var rawPushId = OneSignal.User.PushSubscription.Id;
+        PushSubscriptionId = MaskPushId(rawPushId, HasNotificationPermission);
         IsPushEnabled = OneSignal.User.PushSubscription.OptedIn;
 
         var onesignalId = OneSignal.User.OneSignalId;
@@ -146,7 +152,7 @@ private void UpdateUserStatus(string? externalId)
         var loggedIn = !string.IsNullOrEmpty(externalId);
         LoginButtonText = loggedIn ? "SWITCH USER" : "LOGIN USER";
         UserStatus = loggedIn ? "Logged In" : "Anonymous";
-        ExternalIdDisplay = loggedIn ? externalId! : "–";
+        ExternalIdDisplay = loggedIn ? externalId! : "—";
         IsLoggedIn = loggedIn;
     }
 
@@ -598,10 +604,13 @@ private void OnPushSubscriptionChanged(object? sender, PushSubscriptionChangedEv
     {
         MainThread.BeginInvokeOnMainThread(() =>
         {
-            var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-            PushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
-            IsPushEnabled = OneSignal.User.PushSubscription.OptedIn;
-            Debug.WriteLine($"Push subscription changed: id={rawPushId}, optedIn={IsPushEnabled}");
+            var previous = args.State.Previous;
+            var current = args.State.Current;
+            PushSubscriptionId = MaskPushId(current.Id, HasNotificationPermission);
+            IsPushEnabled = current.OptedIn;
+            Debug.WriteLine(
+                $"Push subscription changed: id={previous.Id} -> {current.Id}, optedIn={previous.OptedIn} -> {current.OptedIn}, token={FormatToken(previous.Token)} -> {FormatToken(current.Token)}"
+            );
         });
     }
 
@@ -613,6 +622,7 @@ OneSignalSDK.DotNet.Core.Notifications.NotificationPermissionChangedEventArgs ar
         MainThread.BeginInvokeOnMainThread(() =>
         {
             HasNotificationPermission = args.Permission;
+            PushSubscriptionId = MaskPushId(OneSignal.User.PushSubscription.Id, HasNotificationPermission);
             Debug.WriteLine($"Permission changed: {args.Permission}");
         });
     }