1.60.40

Author: strongbox-mark

Packages/StrongboxPurchases/Sources/StrongboxPurchases/RCStrongbox.swift

@@ -1,9 +1,19 @@
+//
+//  RCStrongbox.swift
+//  Strongbox
+//
+//  Created by Alex Logan on 14/04/2025.
+//  Copyright © 2025 Mark McGuill. All rights reserved.
+//
+
 import Foundation
 import StoreKit
 import RevenueCat
 
-// Wrapper around RevenueCat to share code for purchases across bundles
 @objc public class RCStrongbox: NSObject {
+
+    
+    
     public enum ProductType: String {
         case monthly = "monthly"
         case yearly = "yearly"
@@ -23,8 +33,8 @@ import RevenueCat
         }
     }
     private static var currentOffering: Offering? = nil
-    private static let syncInfoKey = "sync_info_key"
-    private static let restoreKey = "restore_info_key"
+    private static let syncInfoKey = "sync_info_key_"
+    private static let restoreKey = "restore_info_key_"
     private static let defaultOfferingIdentifier = "default"
 
 
@@ -202,7 +212,16 @@ import RevenueCat
            proEntitlement.productIdentifier.contains(ProductType.lifetime.rawValue) {
             return true
         }
+
 
+        if let proEntitlement = entitlements.active[Entitlement.pro.rawValue], [
+            "com.markmcguill.strongbox.ios.iap.freetrial",
+            "com.markmcguill.strongbox.pro"
+        ]
+        .contains(proEntitlement.productIdentifier) {
+            return true
+        }
+
         return false
     }
 

StrongBox/ProUpgradeIAPManager.m

@@ -472,11 +472,12 @@ - (BOOL)isFreeTrialAvailable {
 #pragma mark - Subscription Updates Handler
 
 - (void)didUpdateSubscription:(BOOL)pro {
-    slog(@"🔄 SubscriptionUpdate - didUpdateSubscription: isPro = %@", pro ? @"YES" : @"NO");
-    
-    
-    [self.preferences setPro:pro];
+    BOOL isPro = pro || CustomizationManager.isAProBundle;
+    slog(@"🔄 SubscriptionUpdate - didUpdateSubscription: isPro = %@ isProBundle = %@", pro ? @"YES" : @"NO", CustomizationManager.isAProBundle ? @"YES" : @"NO");
+
 
+    [self.preferences setPro:isPro];
+
     if (pro) {
         self.preferences.numberOfEntitlementCheckFails = 0;
         self.preferences.appHasBeenDowngradedToFreeEdition = NO;
@@ -491,22 +492,11 @@ - (void)didUpdateSubscription:(BOOL)pro {
 #pragma mark - Subscription Status Notification Handler
 
 - (void)subscriptionStatusChanged:(NSNotification *)notification {
-    BOOL isPro = [notification.userInfo[@"isPro"] boolValue];
-    
+    BOOL isPro = [notification.userInfo[@"isPro"] boolValue] || CustomizationManager.isAProBundle;
+
     slog(@"🔄 Subscription status changed notification received: isPro = %@", isPro ? @"YES" : @"NO");
-    
-    
-    [self.preferences setPro:isPro];
-    
-    if (isPro) {
-        self.preferences.numberOfEntitlementCheckFails = 0;
-        self.preferences.appHasBeenDowngradedToFreeEdition = NO;
-    }
-    
-    
-    if (self.productsAvailableNotify) {
-        self.productsAvailableNotify();
-    }
+
+    [self didUpdateSubscription:isPro];
 }
 
 @end

model/DatabaseAuditor.m

@@ -826,7 +826,7 @@ - (void)checkHibp {
     self.hibpCompletedCount = 0;
 
     
-    BOOL checkForNewBreaches = self.config.checkHibp;
+    BOOL checkForNewBreaches = self.config.checkHibpBreaches;
 
     NSDate *lastChecked = self.config.lastHibpOnlineCheck;
     if (checkForNewBreaches && lastChecked && self.config.hibpCheckForNewBreachesIntervalSeconds > 0) {