diff --git a/src/Shiny.Push/IPushManager.cs b/src/Shiny.Push/IPushManager.cs index fd6d3a3b5..7a9d60b45 100644 --- a/src/Shiny.Push/IPushManager.cs +++ b/src/Shiny.Push/IPushManager.cs @@ -17,6 +17,12 @@ public interface IPushManager /// string? RegistrationToken { get; } + /// + /// This is from the OS and does not necessarily represent the registration token with + /// your push provider. You should use RegistrationToken for everything else - this is for debugging + /// + string? NativeRegistrationToken { get; } + /// /// Requests platform permission to send push notifications /// diff --git a/src/Shiny.Push/Platforms/Android/PushManager.cs b/src/Shiny.Push/Platforms/Android/PushManager.cs index 2d4051412..13fd830bf 100644 --- a/src/Shiny.Push/Platforms/Android/PushManager.cs +++ b/src/Shiny.Push/Platforms/Android/PushManager.cs @@ -54,8 +54,8 @@ public async void Start() try { - this.NativeToken = await this.RequestNativeToken(); - var regToken = await this.provider.Register(this.NativeToken); // never null on firebase + this.NativeRegistrationToken = await this.RequestNativeToken(); + var regToken = await this.provider.Register(this.NativeRegistrationToken); // never null on firebase if (regToken != this.RegistrationToken) { @@ -100,7 +100,7 @@ public string? RegistrationToken string? nativeToken; - public string? NativeToken + public string? NativeRegistrationToken { get => this.nativeToken; set => this.Set(ref this.nativeToken, value); @@ -132,7 +132,7 @@ await this.services ) .ConfigureAwait(false); } - this.NativeToken = nativeToken; + this.NativeRegistrationToken = nativeToken; this.RegistrationToken = regToken; return new PushAccessState(AccessState.Available, this.RegistrationToken); @@ -151,7 +151,7 @@ await this.services ) .ConfigureAwait(false); - this.NativeToken = null; + this.NativeRegistrationToken = null; this.RegistrationToken = null; } diff --git a/src/Shiny.Push/Platforms/Apple/PushManager.cs b/src/Shiny.Push/Platforms/Apple/PushManager.cs index 0c9ac81d2..50218b093 100644 --- a/src/Shiny.Push/Platforms/Apple/PushManager.cs +++ b/src/Shiny.Push/Platforms/Apple/PushManager.cs @@ -56,7 +56,7 @@ public string? RegistrationToken string? nativeToken; - public string? NativeToken + public string? NativeRegistrationToken { get => this.nativeToken; set => this.Set(ref this.nativeToken, value); @@ -133,7 +133,7 @@ await this.services .ConfigureAwait(false); } - this.NativeToken = nativeToken; + this.NativeRegistrationToken = nativeToken; this.RegistrationToken = regToken; return new PushAccessState(AccessState.Available, this.RegistrationToken); @@ -160,7 +160,7 @@ await this.services ) .ConfigureAwait(false); - this.NativeToken = null; + this.NativeRegistrationToken = null; this.RegistrationToken = null; }