Skip to content

Fix SubscriptionStatus property dropping entitlements in both directions #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bilck wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix SubscriptionStatus property dropping entitlements in both directions #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Runtime/Internal/BridgeCallbackHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private static long GetLong(Dictionary<string, object> data, string key, long de
return null;
}

private static SubscriptionStatus DeserializeSubscriptionStatus(Dictionary<string, object> data)
internal static SubscriptionStatus DeserializeSubscriptionStatus(Dictionary<string, object> data)
{
if (data == null) return SubscriptionStatus.CreateUnknown();

Expand Down
21 changes: 13 additions & 8 deletions Runtime/Superwall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,22 +229,27 @@ public SubscriptionStatus SubscriptionStatus
if (!string.IsNullOrEmpty(json))
{
var dict = Json.Deserialize(json) as Dictionary<string, object>;
if (dict != null && dict.ContainsKey("type"))
if (dict != null)
{
string type = dict["type"] as string;
switch (type)
{
case "active": return SubscriptionStatus.CreateActive(new System.Collections.Generic.List<Entitlement>());
case "inactive": return SubscriptionStatus.CreateInactive();
}
return BridgeCallbackHandler.DeserializeSubscriptionStatus(dict);
}
}
return SubscriptionStatus.CreateUnknown();
}
set
{
var data = new Dictionary<string, object>();
data["type"] = value.Type.ToString();
data["type"] = value.Type.ToString().ToLowerInvariant();
if (value is SubscriptionStatus.ActiveStatus active && active.Entitlements != null)
{
var entitlements = new List<object>();
foreach (var entitlement in active.Entitlements)
{
if (entitlement == null || !entitlement.IsActive || string.IsNullOrEmpty(entitlement.Id)) continue;
entitlements.Add(new Dictionary<string, object> { { "id", entitlement.Id } });
}
data["entitlements"] = entitlements;
}
CallNative_SetSubscriptionStatus(Json.Serialize(data));
}
}
Expand Down