Skip to content

Commit a34ecba

Browse files
committed
Disambiguate SubscriptionStatus type
* Ambiguity introduced in latest SDK with StoreKit.SubscriptionStatus
1 parent 0cfca41 commit a34ecba

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Psiphon/BridgingTypes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ import PsiphonClientCommonLibrary
290290
self.hasBeenInIntroPeriod = subscription?.hasBeenInIntroOfferPeriod ?? false
291291
}
292292

293-
static func from(state: SubscriptionStatus) -> BridgedUserSubscription {
293+
static func from(state: AppStoreIAP.SubscriptionStatus) -> BridgedUserSubscription {
294294
switch state {
295295
case .subscribed(let purchase):
296296
return .init(.active, purchase)

Psiphon/NEEvents.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ enum NEEvent {
2929
static func canPresentPurchaseRequiredPrompt(
3030
dateCompare: DateCompare,
3131
psiCashState: PsiCashState,
32-
subscriptionStatus: SubscriptionStatus,
32+
subscriptionStatus: AppStoreIAP.SubscriptionStatus,
3333
tunnelConnectedStatus: TunnelConnectedStatus
3434
) -> Bool {
3535

@@ -49,7 +49,7 @@ enum NEEvent {
4949
static func canPresentDisallowedTrafficPrompt(
5050
dateCompare: DateCompare,
5151
psiCashState: PsiCashState,
52-
subscriptionStatus: SubscriptionStatus,
52+
subscriptionStatus: AppStoreIAP.SubscriptionStatus,
5353
applicationParameters: ApplicationParameters,
5454
tunnelConnectedStatus: TunnelConnectedStatus
5555
) -> Bool {

Psiphon/Settings/SettingsViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import PsiCashClient
2525
// Container for data used by `SettingsViewController`.
2626
struct SettingsViewModel: Equatable {
2727
let receiptRefreshState: ReceiptState.ReceiptRefreshState
28-
let subscriptionState: SubscriptionStatus
28+
let subscriptionState: AppStoreIAP.SubscriptionStatus
2929
let psiCashLib: PsiCashState.PsiCashLibState
3030
let isLoggingOut: Bool
3131
let vpnStatus: VPNStatus

Psiphon/View/SubscriptionBarView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ extension SubscriptionBarView.SubscriptionBarState {
192192

193193
static func make(
194194
subscriptionAuthState: SubscriptionAuthState,
195-
subscriptionStatus: SubscriptionStatus,
195+
subscriptionStatus: AppStoreIAP.SubscriptionStatus,
196196
tunnelStatus: TunnelConnectedStatus
197197
) -> Self {
198198
switch subscriptionStatus {

0 commit comments

Comments
 (0)