From 55a91d0e3aa30c64fc1667cb7ec38ea514e152d8 Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Wed, 27 Jul 2022 15:49:21 -0500 Subject: [PATCH 1/9] Add logs for parity with ProductsFetcherSK1 --- Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift index 1a8efcc7c3..cdaa870675 100644 --- a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift +++ b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift @@ -31,8 +31,13 @@ actor ProductsFetcherSK2 { if let cachedProducts = await self.cachedProducts(withIdentifiers: identifiers) { return cachedProducts } + + Logger.debug( + Strings.offering.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) + ) let storeKitProducts = try await StoreKit.Product.products(for: identifiers) + Logger.rcSuccess(Strings.storeKit.skproductsrequest_received_response) let sk2StoreProducts = Set(storeKitProducts.map { SK2StoreProduct(sk2Product: $0) }) await self.cache(products: sk2StoreProducts) From 31b70057e8578558c38ea969055bd895f36ca0ff Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Thu, 28 Jul 2022 11:11:22 -0400 Subject: [PATCH 2/9] add missing log about cached products --- Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift index cdaa870675..b47af1b014 100644 --- a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift +++ b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift @@ -29,9 +29,11 @@ actor ProductsFetcherSK2 { func products(identifiers: Set) async throws -> Set { do { if let cachedProducts = await self.cachedProducts(withIdentifiers: identifiers) { + let cachedIdentifiers = Set(cachedProducts.map { $0.productIdentifier }) + Logger.debug(Strings.offering.products_already_cached(identifiers: cachedIdentifiers)) return cachedProducts } - + Logger.debug( Strings.offering.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) ) From 965d85adc3c0eb263f5a065064d67bd0c9d8a7ff Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Thu, 28 Jul 2022 13:13:04 -0400 Subject: [PATCH 3/9] Make products request strings storefront-agnostic --- Sources/Logging/Strings/StoreKitStrings.swift | 16 ++++++++-------- Sources/Purchasing/ProductsManager.swift | 9 +++++---- .../StoreKit1/ProductsFetcherSK1.swift | 6 +++--- .../StoreKit2/ProductsFetcherSK2.swift | 5 ++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Sources/Logging/Strings/StoreKitStrings.swift b/Sources/Logging/Strings/StoreKitStrings.swift index f525c11510..708f80b9ec 100644 --- a/Sources/Logging/Strings/StoreKitStrings.swift +++ b/Sources/Logging/Strings/StoreKitStrings.swift @@ -18,13 +18,13 @@ enum StoreKitStrings { case skrequest_failed(error: Error) - case skproductsrequest_failed(error: Error) + case store_products_request_failed(error: Error) case skproductsrequest_timed_out(after: Int) - case skproductsrequest_finished + case store_product_request_did_finish - case skproductsrequest_received_response + case store_product_request_received_response case skunknown_payment_mode(String) @@ -46,8 +46,8 @@ extension StoreKitStrings: CustomStringConvertible { case .skrequest_failed(let error): return "SKRequest failed: \(error.localizedDescription)" - case .skproductsrequest_failed(let error): - return "SKProductsRequest failed! error: \(error.localizedDescription)" + case .store_products_request_failed(let error): + return "Store products request failed! error: \(error.localizedDescription)" case .skproductsrequest_timed_out(let afterTimeInSeconds): return "SKProductsRequest took longer than \(afterTimeInSeconds) seconds, " + @@ -55,11 +55,11 @@ extension StoreKitStrings: CustomStringConvertible { "If this is happening to you consistently, you might want to try using a new Sandbox account. " + "More information: https://rev.cat/skproductsrequest-hangs" - case .skproductsrequest_finished: + case .store_product_request_did_finish: return "SKProductsRequest did finish" - case .skproductsrequest_received_response: - return "SKProductsRequest request received response" + case .store_product_request_received_response: + return "Store products request request received response" case let .skunknown_payment_mode(name): return "Unrecognized PaymentMode: \(name)" diff --git a/Sources/Purchasing/ProductsManager.swift b/Sources/Purchasing/ProductsManager.swift index 387750e65a..bad8de2915 100644 --- a/Sources/Purchasing/ProductsManager.swift +++ b/Sources/Purchasing/ProductsManager.swift @@ -119,9 +119,9 @@ private extension ProductsManager { productsFetcherSK1.products(withIdentifiers: removedProductIdentifiers, completion: { result in switch result { case.success: - Logger.debug(Strings.storeKit.skproductsrequest_finished) + Logger.debug(Strings.storeKit.store_product_request_did_finish) case .failure(let error): - Logger.debug(Strings.storeKit.skproductsrequest_failed(error: error)) + Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) } }) } @@ -134,9 +134,10 @@ private extension ProductsManager { if !removedProductIdentifiers.isEmpty { do { _ = try await self.productsFetcherSK2.products(identifiers: removedProductIdentifiers) - Logger.debug(Strings.storeKit.skproductsrequest_finished) + + Logger.debug(Strings.storeKit.store_product_request_did_finish) } catch { - Logger.debug(Strings.storeKit.skproductsrequest_failed(error: error)) + Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) } } } diff --git a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift index 8be59b5c33..2e2d638095 100644 --- a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift +++ b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift @@ -119,7 +119,7 @@ extension ProductsFetcherSK1: SKProductsRequestDelegate { func productsRequest(_ request: SKProductsRequest, didReceive response: SKProductsResponse) { queue.async { [self] in - Logger.rcSuccess(Strings.storeKit.skproductsrequest_received_response) + Logger.rcSuccess(Strings.storeKit.store_product_request_received_response) guard let productRequest = self.productsByRequests[request] else { Logger.error("requested products not found for request: \(request)") return @@ -141,7 +141,7 @@ extension ProductsFetcherSK1: SKProductsRequestDelegate { } func requestDidFinish(_ request: SKRequest) { - Logger.rcSuccess(Strings.storeKit.skproductsrequest_finished) + Logger.rcSuccess(Strings.storeKit.store_product_request_did_finish) self.cancelRequestToPreventTimeoutWarnings(request) } @@ -151,7 +151,7 @@ extension ProductsFetcherSK1: SKProductsRequestDelegate { } queue.async { [self] in - Logger.appleError(Strings.storeKit.skproductsrequest_failed(error: error)) + Logger.appleError(Strings.storeKit.store_products_request_failed(error: error)) guard let productRequest = self.productsByRequests[request] else { Logger.error(Strings.purchase.requested_products_not_found(request: request)) diff --git a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift index b47af1b014..6644f66a58 100644 --- a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift +++ b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift @@ -29,8 +29,7 @@ actor ProductsFetcherSK2 { func products(identifiers: Set) async throws -> Set { do { if let cachedProducts = await self.cachedProducts(withIdentifiers: identifiers) { - let cachedIdentifiers = Set(cachedProducts.map { $0.productIdentifier }) - Logger.debug(Strings.offering.products_already_cached(identifiers: cachedIdentifiers)) + Logger.debug(Strings.offering.products_already_cached(identifiers: Set(cachedProducts.map { $0.productIdentifier }))) return cachedProducts } @@ -39,7 +38,7 @@ actor ProductsFetcherSK2 { ) let storeKitProducts = try await StoreKit.Product.products(for: identifiers) - Logger.rcSuccess(Strings.storeKit.skproductsrequest_received_response) + Logger.rcSuccess(Strings.storeKit.store_product_request_received_response) let sk2StoreProducts = Set(storeKitProducts.map { SK2StoreProduct(sk2Product: $0) }) await self.cache(products: sk2StoreProducts) From ac73aae5fa124b5f9d62b6d51a9eb6e18dc2c40e Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Thu, 28 Jul 2022 13:14:34 -0400 Subject: [PATCH 4/9] pull skproducts request string to storekit strings --- Sources/Logging/Strings/OfferingStrings.swift | 5 ----- Sources/Logging/Strings/StoreKitStrings.swift | 6 ++++++ Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift | 2 +- Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Sources/Logging/Strings/OfferingStrings.swift b/Sources/Logging/Strings/OfferingStrings.swift index 8722ff751d..01d1c184c2 100644 --- a/Sources/Logging/Strings/OfferingStrings.swift +++ b/Sources/Logging/Strings/OfferingStrings.swift @@ -22,7 +22,6 @@ enum OfferingStrings { case fetching_offerings_error(error: String) case found_existing_product_request(identifiers: Set) case no_cached_offerings_fetching_from_network - case no_cached_requests_and_products_starting_skproduct_request(identifiers: Set) case offerings_stale_updated_from_network case offerings_stale_updating_in_background case offerings_stale_updating_in_foreground @@ -62,10 +61,6 @@ extension OfferingStrings: CustomStringConvertible { case .no_cached_offerings_fetching_from_network: return "No cached Offerings, fetching from network" - case .no_cached_requests_and_products_starting_skproduct_request(let identifiers): - return "No existing requests and " + - "products not cached, starting SKProducts request for: \(identifiers)" - case .offerings_stale_updated_from_network: return "Offerings updated from network." diff --git a/Sources/Logging/Strings/StoreKitStrings.swift b/Sources/Logging/Strings/StoreKitStrings.swift index 708f80b9ec..35952f1b96 100644 --- a/Sources/Logging/Strings/StoreKitStrings.swift +++ b/Sources/Logging/Strings/StoreKitStrings.swift @@ -36,6 +36,8 @@ enum StoreKitStrings { case sk1_discount_missing_locale + case no_cached_requests_and_products_starting_skproduct_request(identifiers: Set) + } extension StoreKitStrings: CustomStringConvertible { @@ -77,6 +79,10 @@ extension StoreKitStrings: CustomStringConvertible { case .sk1_discount_missing_locale: return "There is an issue with the App Store, this SKProductDiscount is missing a Locale - " + "The current device Locale will be used instead." + + case .no_cached_requests_and_products_starting_skproduct_request(let identifiers): + return "No existing requests and " + + "products not cached, starting SKProducts request for: \(identifiers)" } } diff --git a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift index 2e2d638095..14c10db245 100644 --- a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift +++ b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift @@ -60,7 +60,7 @@ class ProductsFetcherSK1: NSObject { } Logger.debug( - Strings.offering.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) + Strings.storeKit.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) ) self.completionHandlers[identifiers] = [completion] diff --git a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift index 6644f66a58..e389f85c0b 100644 --- a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift +++ b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift @@ -34,7 +34,7 @@ actor ProductsFetcherSK2 { } Logger.debug( - Strings.offering.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) + Strings.storeKit.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) ) let storeKitProducts = try await StoreKit.Product.products(for: identifiers) From 7713332707599dea9b382586451d5aa5f86b98d8 Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Thu, 28 Jul 2022 13:23:09 -0400 Subject: [PATCH 5/9] Fix for lint, add two more missing logs for sk2, add comments for discussion --- Sources/Purchasing/ProductsManager.swift | 4 ++++ Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Sources/Purchasing/ProductsManager.swift b/Sources/Purchasing/ProductsManager.swift index bad8de2915..c62cc074a2 100644 --- a/Sources/Purchasing/ProductsManager.swift +++ b/Sources/Purchasing/ProductsManager.swift @@ -106,8 +106,10 @@ private extension ProductsManager { _ = Task { do { let products = try await self.sk2StoreProducts(withIdentifiers: identifiers) + Logger.debug(Strings.storeKit.store_product_request_did_finish) completion(.success(Set(products))) } catch { + Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) completion(.failure(error)) } } @@ -119,8 +121,10 @@ private extension ProductsManager { productsFetcherSK1.products(withIdentifiers: removedProductIdentifiers, completion: { result in switch result { case.success: + // this one is duplicate, though other in ProductsFetcherSK1 is rcSuccess Logger.debug(Strings.storeKit.store_product_request_did_finish) case .failure(let error): + // this one is duplicate, though other in ProductsFetcherSK1 is appleError Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) } }) diff --git a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift index e389f85c0b..18b5e321cd 100644 --- a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift +++ b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift @@ -29,7 +29,11 @@ actor ProductsFetcherSK2 { func products(identifiers: Set) async throws -> Set { do { if let cachedProducts = await self.cachedProducts(withIdentifiers: identifiers) { - Logger.debug(Strings.offering.products_already_cached(identifiers: Set(cachedProducts.map { $0.productIdentifier }))) + Logger.debug( + Strings.offering.products_already_cached( + identifiers: Set(cachedProducts.map { $0.productIdentifier}) + ) + ) return cachedProducts } From 8eff1fd653f8f68fc8a271559a8e2795f0833c17 Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Thu, 28 Jul 2022 13:29:05 -0400 Subject: [PATCH 6/9] lint fix --- .../SubscriberAttributes/SubscriberAttributesManager.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Sources/SubscriberAttributes/SubscriberAttributesManager.swift b/Sources/SubscriberAttributes/SubscriberAttributesManager.swift index fb5b21b33b..5340b2a647 100644 --- a/Sources/SubscriberAttributes/SubscriberAttributesManager.swift +++ b/Sources/SubscriberAttributes/SubscriberAttributesManager.swift @@ -214,10 +214,8 @@ class SubscriberAttributesManager { self.lock.perform { var unsyncedAttributes = self.unsyncedAttributesByKey(appUserID: appUserID) - for (key, attribute) in attributesToSync { - if unsyncedAttributes[key]?.value == attribute.value { - unsyncedAttributes[key]?.isSynced = true - } + for (key, attribute) in attributesToSync where unsyncedAttributes[key]?.value == attribute.value { + unsyncedAttributes[key]?.isSynced = true } self.deviceCache.store(subscriberAttributesByKey: unsyncedAttributes, appUserID: appUserID) From 159a3887e45910f7070b38b9a9ccd41ecb53ead7 Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Mon, 1 Aug 2022 15:34:20 -0500 Subject: [PATCH 7/9] Update last couple skproduct-specific strings, remove duplicate logs --- Sources/Logging/Strings/StoreKitStrings.swift | 9 ++++----- Sources/Purchasing/ProductsManager.swift | 11 +---------- Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift | 2 +- Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Sources/Logging/Strings/StoreKitStrings.swift b/Sources/Logging/Strings/StoreKitStrings.swift index 35952f1b96..89d2f9a5da 100644 --- a/Sources/Logging/Strings/StoreKitStrings.swift +++ b/Sources/Logging/Strings/StoreKitStrings.swift @@ -36,7 +36,7 @@ enum StoreKitStrings { case sk1_discount_missing_locale - case no_cached_requests_and_products_starting_skproduct_request(identifiers: Set) + case no_cached_products_starting_store_products_request(identifiers: Set) } @@ -58,7 +58,7 @@ extension StoreKitStrings: CustomStringConvertible { "More information: https://rev.cat/skproductsrequest-hangs" case .store_product_request_did_finish: - return "SKProductsRequest did finish" + return "Store products request did finish" case .store_product_request_received_response: return "Store products request request received response" @@ -80,9 +80,8 @@ extension StoreKitStrings: CustomStringConvertible { return "There is an issue with the App Store, this SKProductDiscount is missing a Locale - " + "The current device Locale will be used instead." - case .no_cached_requests_and_products_starting_skproduct_request(let identifiers): - return "No existing requests and " + - "products not cached, starting SKProducts request for: \(identifiers)" + case .no_cached_products_starting_store_products_request(let identifiers): + return "No existing products cached, starting store products request for: \(identifiers)" } } diff --git a/Sources/Purchasing/ProductsManager.swift b/Sources/Purchasing/ProductsManager.swift index c62cc074a2..f6300d9684 100644 --- a/Sources/Purchasing/ProductsManager.swift +++ b/Sources/Purchasing/ProductsManager.swift @@ -118,16 +118,7 @@ private extension ProductsManager { func invalidateAndReFetchCachedSK1Products() { productsFetcherSK1.clearCache { [productsFetcherSK1] removedProductIdentifiers in guard !removedProductIdentifiers.isEmpty else { return } - productsFetcherSK1.products(withIdentifiers: removedProductIdentifiers, completion: { result in - switch result { - case.success: - // this one is duplicate, though other in ProductsFetcherSK1 is rcSuccess - Logger.debug(Strings.storeKit.store_product_request_did_finish) - case .failure(let error): - // this one is duplicate, though other in ProductsFetcherSK1 is appleError - Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) - } - }) + productsFetcherSK1.products(withIdentifiers: removedProductIdentifiers, completion: { _ in }) } } diff --git a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift index 14c10db245..3696e8746b 100644 --- a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift +++ b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift @@ -60,7 +60,7 @@ class ProductsFetcherSK1: NSObject { } Logger.debug( - Strings.storeKit.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) + Strings.storeKit.no_cached_products_starting_store_products_request(identifiers: identifiers) ) self.completionHandlers[identifiers] = [completion] diff --git a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift index 18b5e321cd..6a4abe3061 100644 --- a/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift +++ b/Sources/Purchasing/StoreKit2/ProductsFetcherSK2.swift @@ -38,7 +38,7 @@ actor ProductsFetcherSK2 { } Logger.debug( - Strings.storeKit.no_cached_requests_and_products_starting_skproduct_request(identifiers: identifiers) + Strings.storeKit.no_cached_products_starting_store_products_request(identifiers: identifiers) ) let storeKitProducts = try await StoreKit.Product.products(for: identifiers) From 8109ee8696fb4f3f38bf60d53cd26e1e73b9b2b4 Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Mon, 1 Aug 2022 16:50:18 -0500 Subject: [PATCH 8/9] Fix casing --- Sources/Logging/Strings/StoreKitStrings.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Logging/Strings/StoreKitStrings.swift b/Sources/Logging/Strings/StoreKitStrings.swift index 89d2f9a5da..c98a75f536 100644 --- a/Sources/Logging/Strings/StoreKitStrings.swift +++ b/Sources/Logging/Strings/StoreKitStrings.swift @@ -49,7 +49,7 @@ extension StoreKitStrings: CustomStringConvertible { return "SKRequest failed: \(error.localizedDescription)" case .store_products_request_failed(let error): - return "Store products request failed! error: \(error.localizedDescription)" + return "Store products request failed! Error: \(error.localizedDescription)" case .skproductsrequest_timed_out(let afterTimeInSeconds): return "SKProductsRequest took longer than \(afterTimeInSeconds) seconds, " + From 9fcbd95d599752bce5f993a774f486f1c3b0843c Mon Sep 17 00:00:00 2001 From: Maddie Beyl Date: Mon, 1 Aug 2022 17:01:04 -0500 Subject: [PATCH 9/9] quick string updates --- Sources/Logging/Strings/StoreKitStrings.swift | 6 +++--- Sources/Purchasing/ProductsManager.swift | 4 ++-- Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/Logging/Strings/StoreKitStrings.swift b/Sources/Logging/Strings/StoreKitStrings.swift index c98a75f536..657a261af3 100644 --- a/Sources/Logging/Strings/StoreKitStrings.swift +++ b/Sources/Logging/Strings/StoreKitStrings.swift @@ -22,7 +22,7 @@ enum StoreKitStrings { case skproductsrequest_timed_out(after: Int) - case store_product_request_did_finish + case store_product_request_finished case store_product_request_received_response @@ -57,8 +57,8 @@ extension StoreKitStrings: CustomStringConvertible { "If this is happening to you consistently, you might want to try using a new Sandbox account. " + "More information: https://rev.cat/skproductsrequest-hangs" - case .store_product_request_did_finish: - return "Store products request did finish" + case .store_product_request_finished: + return "Store products request finished" case .store_product_request_received_response: return "Store products request request received response" diff --git a/Sources/Purchasing/ProductsManager.swift b/Sources/Purchasing/ProductsManager.swift index f6300d9684..8771ed3115 100644 --- a/Sources/Purchasing/ProductsManager.swift +++ b/Sources/Purchasing/ProductsManager.swift @@ -106,7 +106,7 @@ private extension ProductsManager { _ = Task { do { let products = try await self.sk2StoreProducts(withIdentifiers: identifiers) - Logger.debug(Strings.storeKit.store_product_request_did_finish) + Logger.debug(Strings.storeKit.store_product_request_finished) completion(.success(Set(products))) } catch { Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) @@ -130,7 +130,7 @@ private extension ProductsManager { do { _ = try await self.productsFetcherSK2.products(identifiers: removedProductIdentifiers) - Logger.debug(Strings.storeKit.store_product_request_did_finish) + Logger.debug(Strings.storeKit.store_product_request_finished) } catch { Logger.debug(Strings.storeKit.store_products_request_failed(error: error)) } diff --git a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift index 3696e8746b..30d9ea3dd9 100644 --- a/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift +++ b/Sources/Purchasing/StoreKit1/ProductsFetcherSK1.swift @@ -141,7 +141,7 @@ extension ProductsFetcherSK1: SKProductsRequestDelegate { } func requestDidFinish(_ request: SKRequest) { - Logger.rcSuccess(Strings.storeKit.store_product_request_did_finish) + Logger.rcSuccess(Strings.storeKit.store_product_request_finished) self.cancelRequestToPreventTimeoutWarnings(request) }