refactor(demo): move IsE2EMode to DotEnv, remove value masking

Author: fadi-george

examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs

@@ -1,4 +1,5 @@
 using System;
+using OneSignalDemo.Services;
 using OneSignalDemo.ViewModels;
 using UnityEngine.UIElements;
 
@@ -34,7 +35,7 @@ private VisualElement BuildSection()
             );
 
             var card = SectionBuilder.CreateCard("triggers_card");
-            if (AppViewModel.IsE2EMode)
+            if (DotEnv.IsE2EMode)
             {
                 card.style.paddingTop = 6;
                 card.style.paddingBottom = 6;
@@ -50,7 +51,7 @@ private VisualElement BuildSection()
                 "add_trigger_button",
                 InvokeAdd
             );
-            if (AppViewModel.IsE2EMode)
+            if (DotEnv.IsE2EMode)
             {
                 addButton.style.minHeight = 40;
                 addButton.style.marginBottom = 4;
@@ -61,7 +62,7 @@ private VisualElement BuildSection()
                 "add_multiple_triggers_button",
                 InvokeAddMultiple
             );
-            if (AppViewModel.IsE2EMode)
+            if (DotEnv.IsE2EMode)
             {
                 addMultipleButton.style.minHeight = 40;
                 addMultipleButton.style.marginBottom = 4;

examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs

@@ -73,7 +73,6 @@ public class AppViewModel : MonoBehaviour
         public int LiveActivityStatusIndex => _liveActivityStatusIndex;
         public bool IsLiveActivityUpdating => _isLiveActivityUpdating;
         public bool HasApiKey => _apiService?.HasApiKey() ?? false;
-        public static bool IsE2EMode => DotEnv.IsE2EMode;
 
         public string NextStatusLabel
         {
@@ -97,9 +96,6 @@ public void Init(PreferencesService prefs, OneSignalApiService apiService)
             OneSignal.User.Changed += OnUserChanged;
         }
 
-        private static string MaskValue(string value) =>
-            IsE2EMode && value != "—" ? new string('\u2022', value.Length) : value;
-
         private void OnDestroy()
         {
             if (OneSignal.Default != null)
@@ -112,16 +108,14 @@ private void OnDestroy()
 
         public void LoadInitialState()
         {
-            var rawAppId = _apiService?.GetAppId() ?? "";
-            _appId = MaskValue(rawAppId);
+            _appId = _apiService?.GetAppId() ?? "";
             _consentRequired = _prefs.ConsentRequired;
             _privacyConsentGiven = _prefs.PrivacyConsent;
             _inAppMessagesPaused = _prefs.IamPaused;
             _locationShared = _prefs.LocationShared;
             _externalUserId = _prefs.ExternalUserId;
 
-            var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-            _pushSubscriptionId = MaskValue(rawPushId);
+            _pushSubscriptionId = OneSignal.User.PushSubscription.Id ?? "";
             _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
             _hasPermission = OneSignal.Notifications.Permission;
 
@@ -582,8 +576,7 @@ public async Task FetchUserDataFromApi()
                     _prefs.ExternalUserId = userData.ExternalId;
                 }
 
-                var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-                _pushSubscriptionId = MaskValue(rawPushId);
+                _pushSubscriptionId = OneSignal.User.PushSubscription.Id ?? "";
                 _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
                 _hasPermission = OneSignal.Notifications.Permission;
 
@@ -651,10 +644,9 @@ private static void MergeUnique(List<string> target, IEnumerable<string> source)
 
         private void OnPushSubscriptionChanged(object sender, PushSubscriptionChangedEventArgs e)
         {
-            var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-            _pushSubscriptionId = MaskValue(rawPushId);
+            _pushSubscriptionId = OneSignal.User.PushSubscription.Id ?? "";
             _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
-            Debug.Log($"[{Tag}] Push subscription changed: {rawPushId}");
+            Debug.Log($"[{Tag}] Push subscription changed: {_pushSubscriptionId}");
             NotifyStateChanged();
         }