Skip to content

Commit 8b1d4d3

Browse files
committed
refactor(demo): simplify MaskValue and use em dash literal
1 parent 7e46932 commit 8b1d4d3

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private VisualElement BuildSection()
3535

3636
var pushIdRow = SectionBuilder.CreateInlineKeyValue(
3737
"Push ID",
38-
_viewModel.PushSubscriptionId ?? "\u2013",
38+
_viewModel.PushSubscriptionId ?? "",
3939
"push_id"
4040
);
4141
_pushIdLabel = pushIdRow.Q<Label>("push_id_value");
@@ -71,7 +71,7 @@ private VisualElement BuildSection()
7171

7272
public void Refresh()
7373
{
74-
_pushIdLabel.text = _viewModel.PushSubscriptionId ?? "\u2013";
74+
_pushIdLabel.text = _viewModel.PushSubscriptionId ?? "";
7575
_enabledToggle.SetValueWithoutNotify(_viewModel.PushOptedIn);
7676
_enabledToggle.SetEnabled(_viewModel.HasPermission);
7777
_promptButton.style.display = _viewModel.HasPermission

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void Init(PreferencesService prefs, OneSignalApiService apiService)
9898
}
9999

100100
private static string MaskValue(string value) =>
101-
string.IsNullOrEmpty(value) ? value : new string('\u2022', value.Length);
101+
IsE2EMode && value != "—" ? new string('\u2022', value.Length) : value;
102102

103103
private void OnDestroy()
104104
{
@@ -113,15 +113,15 @@ private void OnDestroy()
113113
public void LoadInitialState()
114114
{
115115
var rawAppId = _apiService?.GetAppId() ?? "";
116-
_appId = IsE2EMode ? MaskValue(rawAppId) : rawAppId;
116+
_appId = MaskValue(rawAppId);
117117
_consentRequired = _prefs.ConsentRequired;
118118
_privacyConsentGiven = _prefs.PrivacyConsent;
119119
_inAppMessagesPaused = _prefs.IamPaused;
120120
_locationShared = _prefs.LocationShared;
121121
_externalUserId = _prefs.ExternalUserId;
122122

123123
var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
124-
_pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
124+
_pushSubscriptionId = MaskValue(rawPushId);
125125
_pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
126126
_hasPermission = OneSignal.Notifications.Permission;
127127

@@ -583,7 +583,7 @@ public async Task FetchUserDataFromApi()
583583
}
584584

585585
var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
586-
_pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
586+
_pushSubscriptionId = MaskValue(rawPushId);
587587
_pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
588588
_hasPermission = OneSignal.Notifications.Permission;
589589

@@ -652,7 +652,7 @@ private static void MergeUnique(List<string> target, IEnumerable<string> source)
652652
private void OnPushSubscriptionChanged(object sender, PushSubscriptionChangedEventArgs e)
653653
{
654654
var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
655-
_pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
655+
_pushSubscriptionId = MaskValue(rawPushId);
656656
_pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
657657
Debug.Log($"[{Tag}] Push subscription changed: {rawPushId}");
658658
NotifyStateChanged();

0 commit comments

Comments
 (0)