Fix: application state check on app extensions

Purchases/Misc/RCCrossPlatformSupport.h

@@ -61,11 +61,3 @@
 #else
 #define PURCHASES_INITIATED_FROM_APP_STORE_AVAILABLE 0
 #endif
-
-#if TARGET_OS_IOS || TARGET_OS_TV
-#define IS_APPLICATION_BACKGROUNDED UIApplication.sharedApplication.applicationState == UIApplicationStateBackground
-#elif TARGET_OS_OSX
-#define IS_APPLICATION_BACKGROUNDED NO
-#elif TARGET_OS_WATCH
-#define IS_APPLICATION_BACKGROUNDED WKExtension.sharedExtension.applicationState == WKApplicationStateBackground
-#endif

Purchases/Misc/RCSystemInfo.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, copy, readonly) NSString *platformFlavorVersion;
 
 
-- (BOOL)isApplicationBackgrounded;
+- (void)isApplicationBackgroundedWithCompletion:(void(^)(BOOL))completion; // calls completion on the main thread
 
 + (BOOL)isSandbox;
 + (NSString *)frameworkVersion;

Purchases/Misc/RCSystemInfo.m

@@ -83,10 +83,43 @@ + (void)setProxyURL:(nullable NSURL *)newProxyURL {
     }
 }
 
+- (void)isApplicationBackgroundedWithCompletion:(void(^)(BOOL))completion {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        BOOL isApplicationBackgrounded = self.isApplicationBackgrounded;
+        completion(isApplicationBackgrounded);
+    });
+}
+
 - (BOOL)isApplicationBackgrounded {
-    return IS_APPLICATION_BACKGROUNDED;
+#if TARGET_OS_IOS
+    return self.isApplicationBackgroundedIOS;
+#elif TARGET_OS_TV
+    return  UIApplication.sharedApplication.applicationState == UIApplicationStateBackground;
+#elif TARGET_OS_OSX
+    return  NO;
+#elif TARGET_OS_WATCH
+    return  WKExtension.sharedExtension.applicationState == WKApplicationStateBackground;
+#endif
+}
+
+#if TARGET_OS_IOS
+
+- (BOOL)isApplicationBackgroundedIOS {
+    if (self.isAppExtension) {
+        return YES;
+    }
+    NSString *sharedApplicationPropertyName = @"sharedApplication";
+
+    UIApplication *sharedApplication = [UIApplication valueForKey:sharedApplicationPropertyName];
+    return sharedApplication.applicationState == UIApplicationStateBackground;
 }
 
+- (BOOL)isAppExtension {
+    return [NSBundle.mainBundle.bundlePath hasSuffix:@".appex"];
+}
+
+#endif
+
 @end
 
 

Purchases/Public/RCPurchases.m

@@ -295,12 +295,18 @@ - (instancetype)initWithAppUserID:(nullable NSString *)appUserID
         };
 
         [self.identityManager configureWithAppUserID:appUserID];
-        if (!self.systemInfo.isApplicationBackgrounded) {
-            [self updateAllCachesWithCompletionBlock:callDelegate];
-        } else {
-            [self sendCachedPurchaserInfoIfAvailable];
-        }
-
+
+        [self.systemInfo isApplicationBackgroundedWithCompletion:^(BOOL isBackgrounded) {
+            if (!isBackgrounded) {
+                dispatch_queue_t backgroundQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+                dispatch_async(backgroundQueue, ^{
+                    [self updateAllCachesWithCompletionBlock:callDelegate];
+                });
+            } else {
+                [self sendCachedPurchaserInfoIfAvailable];
+            }
+        }];
+
         [self configureSubscriberAttributesManager];
 
         self.storeKitWrapper.delegate = self;

PurchasesTests/Mocks/MockSystemInfo.swift

@@ -11,7 +11,7 @@ import Foundation
 class MockSystemInfo: RCSystemInfo {
     var stubbedIsApplicationBackgrounded: Bool?
 
-    override func isApplicationBackgrounded() -> Bool {
-        return stubbedIsApplicationBackgrounded ?? super.isApplicationBackgrounded()
+    override func isApplicationBackgrounded(completion: @escaping (Bool) -> Void) {
+        completion(stubbedIsApplicationBackgrounded ?? false)
     }
 }

PurchasesTests/Networking/HTTPClientTests.swift

@@ -206,10 +206,17 @@ class HTTPClientTests: XCTestCase {
         }
 
         self.client.performRequest("GET", path: path, body: nil, headers: nil) { (status, data, responseError) in
-            successFailed = (status >= 500) && (data == nil) && (error == responseError as NSError?)
+            if let responseNSError = responseError as? NSError {
+                successFailed = (status >= 500
+                                 && data == nil
+                                 && error.domain == responseNSError.domain
+                                 && error.code == responseNSError.code)
+            } else {
+                successFailed = false
+            }
         }
 
-        expect(successFailed).toEventually(equal(true), timeout: 1.0)
+        expect(successFailed).toEventually(equal(true))
     }
 
     func testServerSide400s() {

PurchasesTests/Purchasing/PurchasesTests.swift

@@ -12,6 +12,8 @@ class PurchasesTests: XCTestCase {
 
     override func setUp() {
         self.userDefaults = UserDefaults(suiteName: "TestDefaults")
+        requestFetcher = MockRequestFetcher()
+        systemInfo = MockSystemInfo(platformFlavor: nil, platformFlavorVersion: nil, finishTransactions: true)
     }
 
     override func tearDown() {
@@ -169,7 +171,7 @@ class PurchasesTests: XCTestCase {
 
 
     let receiptFetcher = MockReceiptFetcher()
-    let requestFetcher = MockRequestFetcher()
+    var requestFetcher: MockRequestFetcher!
     let backend = MockBackend()
     let storeKitWrapper = MockStoreKitWrapper()
     let notificationCenter = MockNotificationCenter()
@@ -179,7 +181,7 @@ class PurchasesTests: XCTestCase {
     let deviceCache = MockDeviceCache()
     let subscriberAttributesManager = MockSubscriberAttributesManager()
     let identityManager = MockUserManager(mockAppUserID: "app_user");
-    let systemInfo = MockSystemInfo(platformFlavor: nil, platformFlavorVersion: nil, finishTransactions: true)
+    var systemInfo: MockSystemInfo!
 
     let purchasesDelegate = MockPurchasesDelegate()
 
@@ -641,7 +643,8 @@ class PurchasesTests: XCTestCase {
         }
     }
 
-    func testFetchesProductInfoIfNotCachedAndAppActive() {
+    func testFetchesProductInfoIfNotCached() {
+        systemInfo.stubbedIsApplicationBackgrounded = true
         setupPurchases()
         let product = MockSKProduct(mockProductIdentifier: "com.product.id1")
 
@@ -657,7 +660,7 @@ class PurchasesTests: XCTestCase {
         transaction.mockState = SKPaymentTransactionState.purchased
         self.storeKitWrapper.delegate?.storeKitWrapper(self.storeKitWrapper, updatedTransaction: transaction)
 
-        expect(self.requestFetcher.requestedProducts! as NSSet).to(contain([product.productIdentifier]))
+        expect(self.requestFetcher.requestedProducts! as NSSet).toEventually(contain([product.productIdentifier]))
 
         expect(self.backend.postedProductID).toNot(beNil())
         expect(self.backend.postedPrice).toNot(beNil())
@@ -1270,7 +1273,7 @@ class PurchasesTests: XCTestCase {
 
         setupPurchases()
 
-        expect(self.backend.getSubscriberCallCount).to(equal(1))
+        expect(self.backend.getSubscriberCallCount).toEventually(equal(1))
 
         purchases!.purchaserInfo { (info, error) in
         }
@@ -2074,7 +2077,7 @@ class PurchasesTests: XCTestCase {
         expect(self.backend.getSubscriberCallCount).toEventually(equal(2))
         expect(self.deviceCache.cachedPurchaserInfo.count).toEventually(equal(2))
         expect(self.deviceCache.cachedPurchaserInfo[newAppUserID]).toNot(beNil())
-        expect(self.purchasesDelegate.purchaserInfoReceivedCount).toEventually(equal(2))
+        expect(self.purchasesDelegate.purchaserInfoReceivedCount).toEventually(equal(2), timeout: 3.0)
         expect(self.deviceCache.setPurchaserInfoCacheTimestampToNowCount).toEventually(equal(2))
         expect(self.deviceCache.setOfferingsCacheTimestampToNowCount).toEventually(equal(2))
         expect(self.backend.gotOfferings).toEventually(equal(2))