diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce68322dc..a7a154d06 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,7 +131,7 @@ jobs: path: | ./Branch_noidfa.zip ./checksum_noidfa.txt - ./Branch_noidfa_signed_xcframework + ./Branch_noidfa_signed_xcframework.zip ./checksum_noidfa_signed_xcframework.txt build-static-framework: diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCAppleReceiptTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCAppleReceiptTests.m deleted file mode 100644 index faff0ef96..000000000 --- a/Branch-TestBed/Branch-SDK-Tests/BNCAppleReceiptTests.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// BNCAppleReceiptTests.m -// Branch-SDK-Tests -// -// Created by Ernest Cho on 7/15/19. -// Copyright © 2019 Branch, Inc. All rights reserved. -// - -#import -#import "BNCAppleReceipt.h" - -@interface BNCAppleReceiptTests : XCTestCase - -@end - -@implementation BNCAppleReceiptTests - -- (void)setUp { - -} - -- (void)tearDown { - -} - -- (void)testReceiptOnSimulator { - BNCAppleReceipt *receipt = [[BNCAppleReceipt alloc] init]; - // Appears the simulator can have a receipt - //XCTAssertNil([receipt installReceipt]); - XCTAssertFalse([receipt isTestFlight]); -} - -@end diff --git a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj index c55c7fb00..ee284e032 100644 --- a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj +++ b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj @@ -116,7 +116,6 @@ 5F644BFE2B7AA811000DCD78 /* BNCServerInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B6C2B7AA810000DCD78 /* BNCServerInterface.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5F644BFF2B7AA811000DCD78 /* BNCProductCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B6D2B7AA810000DCD78 /* BNCProductCategory.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5F644C002B7AA811000DCD78 /* BNCKeyChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B6F2B7AA810000DCD78 /* BNCKeyChain.h */; }; - 5F644C012B7AA811000DCD78 /* BNCAppleReceipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B702B7AA810000DCD78 /* BNCAppleReceipt.h */; }; 5F644C022B7AA811000DCD78 /* BNCPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B712B7AA810000DCD78 /* BNCPasteboard.h */; }; 5F644C032B7AA811000DCD78 /* BranchContentPathProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B722B7AA810000DCD78 /* BranchContentPathProperties.h */; }; 5F644C042B7AA811000DCD78 /* BNCSKAdNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F644B732B7AA810000DCD78 /* BNCSKAdNetwork.h */; }; @@ -169,7 +168,6 @@ 5F644C362B7AA811000DCD78 /* BNCSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BA52B7AA811000DCD78 /* BNCSKAdNetwork.m */; }; 5F644C372B7AA811000DCD78 /* BranchContentPathProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BA62B7AA811000DCD78 /* BranchContentPathProperties.m */; }; 5F644C382B7AA811000DCD78 /* BNCPasteboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BA72B7AA811000DCD78 /* BNCPasteboard.m */; }; - 5F644C392B7AA811000DCD78 /* BNCAppleReceipt.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BA82B7AA811000DCD78 /* BNCAppleReceipt.m */; }; 5F644C3A2B7AA811000DCD78 /* BranchLinkProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BA92B7AA811000DCD78 /* BranchLinkProperties.m */; }; 5F644C3B2B7AA811000DCD78 /* BNCInitSessionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BAA2B7AA811000DCD78 /* BNCInitSessionResponse.m */; }; 5F644C3C2B7AA811000DCD78 /* BNCLinkCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F644BAB2B7AA811000DCD78 /* BNCLinkCache.m */; }; @@ -205,7 +203,6 @@ 5FC4CF9024860C440001E701 /* example.json in Resources */ = {isa = PBXBuildFile; fileRef = 5FC4CF8224860C320001E701 /* example.json */; }; 5FC4CF9124860C440001E701 /* latd_empty_data.json in Resources */ = {isa = PBXBuildFile; fileRef = 5FC4CF8324860C320001E701 /* latd_empty_data.json */; }; 5FC4CF9224860C440001E701 /* latd_missing_data.json in Resources */ = {isa = PBXBuildFile; fileRef = 5FC4CF8424860C320001E701 /* latd_missing_data.json */; }; - 5FC7327022DD1F93006E6FBC /* BNCAppleReceiptTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FC7326F22DD1F93006E6FBC /* BNCAppleReceiptTests.m */; }; 5FCDD36A2B7AC1D500EAF29F /* BranchPluginSupportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F393927A0872800BF5D36 /* BranchPluginSupportTests.m */; }; 5FCF7EAD29DC96A7008D629E /* BNCURLFilterSkiplistUpgradeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCF7EAC29DC96A7008D629E /* BNCURLFilterSkiplistUpgradeTests.m */; }; 5FD1786E26DEE49D009696E3 /* BNCPasteboardTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FD1786D26DEE49C009696E3 /* BNCPasteboardTests.m */; }; @@ -426,7 +423,6 @@ 5F644B6C2B7AA810000DCD78 /* BNCServerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCServerInterface.h; sourceTree = ""; }; 5F644B6D2B7AA810000DCD78 /* BNCProductCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCProductCategory.h; sourceTree = ""; }; 5F644B6F2B7AA810000DCD78 /* BNCKeyChain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCKeyChain.h; sourceTree = ""; }; - 5F644B702B7AA810000DCD78 /* BNCAppleReceipt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCAppleReceipt.h; sourceTree = ""; }; 5F644B712B7AA810000DCD78 /* BNCPasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCPasteboard.h; sourceTree = ""; }; 5F644B722B7AA810000DCD78 /* BranchContentPathProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchContentPathProperties.h; sourceTree = ""; }; 5F644B732B7AA810000DCD78 /* BNCSKAdNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCSKAdNetwork.h; sourceTree = ""; }; @@ -479,7 +475,6 @@ 5F644BA52B7AA811000DCD78 /* BNCSKAdNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCSKAdNetwork.m; sourceTree = ""; }; 5F644BA62B7AA811000DCD78 /* BranchContentPathProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentPathProperties.m; sourceTree = ""; }; 5F644BA72B7AA811000DCD78 /* BNCPasteboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCPasteboard.m; sourceTree = ""; }; - 5F644BA82B7AA811000DCD78 /* BNCAppleReceipt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCAppleReceipt.m; sourceTree = ""; }; 5F644BA92B7AA811000DCD78 /* BranchLinkProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchLinkProperties.m; sourceTree = ""; }; 5F644BAA2B7AA811000DCD78 /* BNCInitSessionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCInitSessionResponse.m; sourceTree = ""; }; 5F644BAB2B7AA811000DCD78 /* BNCLinkCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCLinkCache.m; sourceTree = ""; }; @@ -516,7 +511,6 @@ 5FC4CF8224860C320001E701 /* example.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = example.json; sourceTree = ""; }; 5FC4CF8324860C320001E701 /* latd_empty_data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = latd_empty_data.json; sourceTree = ""; }; 5FC4CF8424860C320001E701 /* latd_missing_data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = latd_missing_data.json; sourceTree = ""; }; - 5FC7326F22DD1F93006E6FBC /* BNCAppleReceiptTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCAppleReceiptTests.m; sourceTree = ""; }; 5FCF7EAC29DC96A7008D629E /* BNCURLFilterSkiplistUpgradeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCURLFilterSkiplistUpgradeTests.m; sourceTree = ""; }; 5FD1786D26DEE49C009696E3 /* BNCPasteboardTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCPasteboardTests.m; sourceTree = ""; }; 5FDB04EF24E4D27000F2F267 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; @@ -659,7 +653,6 @@ children = ( E7AE4A082DFB2C4400696805 /* BranchConfigurationControllerTests.m */, E7A728BC2AA9A112009343B7 /* BNCAPIServerTest.m */, - 5FC7326F22DD1F93006E6FBC /* BNCAppleReceiptTests.m */, 4D1683972098C901008819E3 /* BNCApplicationTests.m */, 5FE694372405FA2700E3AEE2 /* BNCCallbackMapTests.m */, 4D16839D2098C901008819E3 /* BNCCrashlyticsWrapperTests.m */, @@ -729,7 +722,6 @@ children = ( E563942F2CC7AC9500E18E65 /* BranchFileLogger.m */, 5F644BB02B7AA811000DCD78 /* BNCAppGroupsData.m */, - 5F644BA82B7AA811000DCD78 /* BNCAppleReceipt.m */, 5F644B2B2B7AA810000DCD78 /* BNCApplication.m */, 5F644BB72B7AA811000DCD78 /* BNCCallbackMap.m */, 5F644B3D2B7AA810000DCD78 /* BNCConfig.m */, @@ -848,7 +840,6 @@ E7AE4A0B2DFB2D0100696805 /* BranchConfigurationController.h */, E71E397A2DD3C14800110F59 /* BNCInAppBrowser.h */, 5F644B762B7AA810000DCD78 /* BNCAppGroupsData.h */, - 5F644B702B7AA810000DCD78 /* BNCAppleReceipt.h */, 5F644B812B7AA811000DCD78 /* BNCApplication.h */, 5F644B7B2B7AA811000DCD78 /* BNCCallbackMap.h */, 5F644B952B7AA811000DCD78 /* BNCConfig.h */, @@ -1088,7 +1079,6 @@ 5F644C072B7AA811000DCD78 /* BNCAppGroupsData.h in Headers */, 5F644C252B7AA811000DCD78 /* BranchContentDiscoveryManifest.h in Headers */, 5F644C162B7AA811000DCD78 /* BNCEncodingUtils.h in Headers */, - 5F644C012B7AA811000DCD78 /* BNCAppleReceipt.h in Headers */, 5F644C1E2B7AA811000DCD78 /* Branch+Validator.h in Headers */, 5F644C112B7AA811000DCD78 /* BNCUrlQueryParameter.h in Headers */, 5F644C2B2B7AA811000DCD78 /* BNCCrashlyticsWrapper.h in Headers */, @@ -1441,7 +1431,6 @@ 5F644BCD2B7AA811000DCD78 /* BNCServerRequest.m in Sources */, 5F644C3A2B7AA811000DCD78 /* BranchLinkProperties.m in Sources */, 5F644C432B7AA811000DCD78 /* BranchEvent.m in Sources */, - 5F644C392B7AA811000DCD78 /* BNCAppleReceipt.m in Sources */, 5F644BDA2B7AA811000DCD78 /* BNCReferringURLUtility.m in Sources */, 5F644C422B7AA811000DCD78 /* BNCServerResponse.m in Sources */, 5F644C3B2B7AA811000DCD78 /* BNCInitSessionResponse.m in Sources */, @@ -1511,7 +1500,6 @@ 5F3D671B233062FD00454FF1 /* BNCJsonLoader.m in Sources */, 4D1683C02098C902008819E3 /* BranchUniversalObjectTests.m in Sources */, E7AE4A092DFB2C4400696805 /* BranchConfigurationControllerTests.m in Sources */, - 5FC7327022DD1F93006E6FBC /* BNCAppleReceiptTests.m in Sources */, 4D1683C82098C902008819E3 /* NSStringBranchTests.m in Sources */, 5F892EC5236116CD0023AEC1 /* NSErrorBranchTests.m in Sources */, 4D1683B62098C902008819E3 /* BNCURLFilterTests.m in Sources */, diff --git a/BranchSDK.xcodeproj/project.pbxproj b/BranchSDK.xcodeproj/project.pbxproj index a478d1411..3c62bfdfd 100644 --- a/BranchSDK.xcodeproj/project.pbxproj +++ b/BranchSDK.xcodeproj/project.pbxproj @@ -278,9 +278,6 @@ 5FCDD4D42B7AC6A200EAF29F /* BNCKeyChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B52B7AC6A100EAF29F /* BNCKeyChain.h */; }; 5FCDD4D52B7AC6A200EAF29F /* BNCKeyChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B52B7AC6A100EAF29F /* BNCKeyChain.h */; }; 5FCDD4D62B7AC6A200EAF29F /* BNCKeyChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B52B7AC6A100EAF29F /* BNCKeyChain.h */; }; - 5FCDD4D72B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B62B7AC6A100EAF29F /* BNCAppleReceipt.h */; }; - 5FCDD4D82B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B62B7AC6A100EAF29F /* BNCAppleReceipt.h */; }; - 5FCDD4D92B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B62B7AC6A100EAF29F /* BNCAppleReceipt.h */; }; 5FCDD4DA2B7AC6A200EAF29F /* BNCPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B72B7AC6A100EAF29F /* BNCPasteboard.h */; }; 5FCDD4DB2B7AC6A200EAF29F /* BNCPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B72B7AC6A100EAF29F /* BNCPasteboard.h */; }; 5FCDD4DC2B7AC6A200EAF29F /* BNCPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3B72B7AC6A100EAF29F /* BNCPasteboard.h */; }; @@ -437,9 +434,6 @@ 5FCDD57C2B7AC6A400EAF29F /* BNCPasteboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3ED2B7AC6A100EAF29F /* BNCPasteboard.m */; }; 5FCDD57D2B7AC6A400EAF29F /* BNCPasteboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3ED2B7AC6A100EAF29F /* BNCPasteboard.m */; }; 5FCDD57E2B7AC6A400EAF29F /* BNCPasteboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3ED2B7AC6A100EAF29F /* BNCPasteboard.m */; }; - 5FCDD57F2B7AC6A400EAF29F /* BNCAppleReceipt.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3EE2B7AC6A100EAF29F /* BNCAppleReceipt.m */; }; - 5FCDD5802B7AC6A400EAF29F /* BNCAppleReceipt.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3EE2B7AC6A100EAF29F /* BNCAppleReceipt.m */; }; - 5FCDD5812B7AC6A400EAF29F /* BNCAppleReceipt.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3EE2B7AC6A100EAF29F /* BNCAppleReceipt.m */; }; 5FCDD5822B7AC6A400EAF29F /* BranchLinkProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3EF2B7AC6A100EAF29F /* BranchLinkProperties.m */; }; 5FCDD5832B7AC6A400EAF29F /* BranchLinkProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3EF2B7AC6A100EAF29F /* BranchLinkProperties.m */; }; 5FCDD5842B7AC6A400EAF29F /* BranchLinkProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FCDD3EF2B7AC6A100EAF29F /* BranchLinkProperties.m */; }; @@ -646,7 +640,6 @@ 5FCDD3B22B7AC6A100EAF29F /* BNCServerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCServerInterface.h; sourceTree = ""; }; 5FCDD3B32B7AC6A100EAF29F /* BNCProductCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCProductCategory.h; sourceTree = ""; }; 5FCDD3B52B7AC6A100EAF29F /* BNCKeyChain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCKeyChain.h; sourceTree = ""; }; - 5FCDD3B62B7AC6A100EAF29F /* BNCAppleReceipt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCAppleReceipt.h; sourceTree = ""; }; 5FCDD3B72B7AC6A100EAF29F /* BNCPasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCPasteboard.h; sourceTree = ""; }; 5FCDD3B82B7AC6A100EAF29F /* BranchContentPathProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchContentPathProperties.h; sourceTree = ""; }; 5FCDD3B92B7AC6A100EAF29F /* BNCSKAdNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCSKAdNetwork.h; sourceTree = ""; }; @@ -699,7 +692,6 @@ 5FCDD3EB2B7AC6A100EAF29F /* BNCSKAdNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCSKAdNetwork.m; sourceTree = ""; }; 5FCDD3EC2B7AC6A100EAF29F /* BranchContentPathProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentPathProperties.m; sourceTree = ""; }; 5FCDD3ED2B7AC6A100EAF29F /* BNCPasteboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCPasteboard.m; sourceTree = ""; }; - 5FCDD3EE2B7AC6A100EAF29F /* BNCAppleReceipt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCAppleReceipt.m; sourceTree = ""; }; 5FCDD3EF2B7AC6A100EAF29F /* BranchLinkProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchLinkProperties.m; sourceTree = ""; }; 5FCDD3F02B7AC6A100EAF29F /* BNCInitSessionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCInitSessionResponse.m; sourceTree = ""; }; 5FCDD3F12B7AC6A100EAF29F /* BNCLinkCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCLinkCache.m; sourceTree = ""; }; @@ -843,7 +835,6 @@ E71E396E2DD3A92900110F59 /* BNCInAppBrowser.m */, E52E5B092CC79E5C00F553EE /* BranchFileLogger.m */, 5FCDD3F62B7AC6A100EAF29F /* BNCAppGroupsData.m */, - 5FCDD3EE2B7AC6A100EAF29F /* BNCAppleReceipt.m */, 5FCDD3712B7AC6A100EAF29F /* BNCApplication.m */, 5FCDD3FD2B7AC6A100EAF29F /* BNCCallbackMap.m */, 5FCDD3832B7AC6A100EAF29F /* BNCConfig.m */, @@ -959,7 +950,6 @@ isa = PBXGroup; children = ( 5FCDD3BC2B7AC6A100EAF29F /* BNCAppGroupsData.h */, - 5FCDD3B62B7AC6A100EAF29F /* BNCAppleReceipt.h */, 5FCDD3C72B7AC6A100EAF29F /* BNCApplication.h */, 5FCDD3C12B7AC6A100EAF29F /* BNCCallbackMap.h */, 5FCDD3DB2B7AC6A100EAF29F /* BNCConfig.h */, @@ -1108,7 +1098,6 @@ 5FCDD4F52B7AC6A200EAF29F /* BNCEventUtils.h in Headers */, 5FCDD5612B7AC6A300EAF29F /* BNCReachability.h in Headers */, 5FCDD50D2B7AC6A300EAF29F /* NSMutableDictionary+Branch.h in Headers */, - 5FCDD4D72B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */, E71E39742DD3A92900110F59 /* BNCInAppBrowser.h in Headers */, 5FCDD54F2B7AC6A300EAF29F /* BranchJsonConfig.h in Headers */, 5FCDD4E02B7AC6A200EAF29F /* BNCSKAdNetwork.h in Headers */, @@ -1194,7 +1183,6 @@ 5FCDD5622B7AC6A300EAF29F /* BNCReachability.h in Headers */, 5FCDD50E2B7AC6A300EAF29F /* NSMutableDictionary+Branch.h in Headers */, E71E39722DD3A92900110F59 /* BNCInAppBrowser.h in Headers */, - 5FCDD4D82B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */, 5FCDD5502B7AC6A300EAF29F /* BranchJsonConfig.h in Headers */, 5FCDD4E12B7AC6A200EAF29F /* BNCSKAdNetwork.h in Headers */, E73D02822DEE8AE90076C3F1 /* BranchConfigurationController.h in Headers */, @@ -1278,7 +1266,6 @@ 5FCDD5632B7AC6A300EAF29F /* BNCReachability.h in Headers */, 5FCDD50F2B7AC6A300EAF29F /* NSMutableDictionary+Branch.h in Headers */, E71E396F2DD3A92900110F59 /* BNCInAppBrowser.h in Headers */, - 5FCDD4D92B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */, 5FCDD5512B7AC6A300EAF29F /* BranchJsonConfig.h in Headers */, 5FCDD4E22B7AC6A200EAF29F /* BNCSKAdNetwork.h in Headers */, E73D02862DEE8AE90076C3F1 /* BranchConfigurationController.h in Headers */, @@ -1669,7 +1656,6 @@ 5FCDD43B2B7AC6A100EAF29F /* BNCServerRequest.m in Sources */, 5FCDD5822B7AC6A400EAF29F /* BranchLinkProperties.m in Sources */, 5FCDD59D2B7AC6A400EAF29F /* BranchEvent.m in Sources */, - 5FCDD57F2B7AC6A400EAF29F /* BNCAppleReceipt.m in Sources */, 5FCDD4622B7AC6A100EAF29F /* BNCReferringURLUtility.m in Sources */, 5FCDD59A2B7AC6A400EAF29F /* BNCServerResponse.m in Sources */, 5FCDD5852B7AC6A400EAF29F /* BNCInitSessionResponse.m in Sources */, @@ -1777,7 +1763,6 @@ 5FCDD43C2B7AC6A100EAF29F /* BNCServerRequest.m in Sources */, 5FCDD5832B7AC6A400EAF29F /* BranchLinkProperties.m in Sources */, 5FCDD59E2B7AC6A400EAF29F /* BranchEvent.m in Sources */, - 5FCDD5802B7AC6A400EAF29F /* BNCAppleReceipt.m in Sources */, 5FCDD4632B7AC6A100EAF29F /* BNCReferringURLUtility.m in Sources */, 5FCDD59B2B7AC6A400EAF29F /* BNCServerResponse.m in Sources */, 5FCDD5862B7AC6A400EAF29F /* BNCInitSessionResponse.m in Sources */, @@ -1847,7 +1832,6 @@ E73D02852DEE8AE90076C3F1 /* BranchConfigurationController.m in Sources */, 5FCDD5842B7AC6A400EAF29F /* BranchLinkProperties.m in Sources */, 5FCDD59F2B7AC6A400EAF29F /* BranchEvent.m in Sources */, - 5FCDD5812B7AC6A400EAF29F /* BNCAppleReceipt.m in Sources */, 5FCDD4642B7AC6A100EAF29F /* BNCReferringURLUtility.m in Sources */, 5FCDD59C2B7AC6A400EAF29F /* BNCServerResponse.m in Sources */, 5FCDD5872B7AC6A400EAF29F /* BNCInitSessionResponse.m in Sources */, diff --git a/Sources/BranchSDK/BNCAppleReceipt.m b/Sources/BranchSDK/BNCAppleReceipt.m deleted file mode 100644 index 3536b7e89..000000000 --- a/Sources/BranchSDK/BNCAppleReceipt.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// BNCAppleReceipt.m -// Branch -// -// Created by Ernest Cho on 7/11/19. -// Copyright © 2019 Branch, Inc. All rights reserved. -// - -#import "BNCAppleReceipt.h" - -@interface BNCAppleReceipt() - -/* - Simulator - no receipt, isSandbox = NO - Testflight or developer side load - no receipt, isSandbox = YES - App Store installed - receipt, isSandbox = NO - */ -@property (nonatomic, copy, readwrite) NSString *receipt; -@property (nonatomic, assign, readwrite) BOOL isSandboxReceipt; - -@end - -@implementation BNCAppleReceipt - -+ (BNCAppleReceipt *)sharedInstance { - static BNCAppleReceipt *singleton = nil; - static dispatch_once_t onceToken = 0; - dispatch_once(&onceToken, ^{ - singleton = [BNCAppleReceipt new]; - }); - return singleton; -} - -- (instancetype)init { - self = [super init]; - if (self) { - self.receipt = nil; - self.isSandboxReceipt = NO; - - [self readReceipt]; - } - return self; -} - -- (void)readReceipt { - NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL]; - if (receiptURL) { - self.isSandboxReceipt = [receiptURL.lastPathComponent isEqualToString:@"sandboxReceipt"]; - - NSData *receiptData = [NSData dataWithContentsOfURL:receiptURL]; - if (receiptData) { - self.receipt = [receiptData base64EncodedStringWithOptions:0]; - } - } -} - -- (nullable NSString *)installReceipt { - return self.receipt; -} - -- (BOOL)isTestFlight { - // sandbox receipts are from testflight or side loaded development devices - return self.isSandboxReceipt; -} - -@end diff --git a/Sources/BranchSDK/BNCRequestFactory.m b/Sources/BranchSDK/BNCRequestFactory.m index 226d77f07..d6aae49e4 100644 --- a/Sources/BranchSDK/BNCRequestFactory.m +++ b/Sources/BranchSDK/BNCRequestFactory.m @@ -29,7 +29,6 @@ #import "BNCPartnerParameters.h" #import "BNCDeviceInfo.h" #import "BNCPreferenceHelper.h" -#import "BNCAppleReceipt.h" #import "BNCAppGroupsData.h" #import "BNCSKAdNetwork.h" #import "BNCReferringURLUtility.h" @@ -47,7 +46,6 @@ @interface BNCRequestFactory() @property (nonatomic, strong, readwrite) BNCApplication *application; @property (nonatomic, strong, readwrite) BNCAppGroupsData *appGroupsData; @property (nonatomic, strong, readwrite) BNCSKAdNetwork *skAdNetwork; -@property (nonatomic, strong, readwrite) BNCAppleReceipt *appleReceipt; @property (nonatomic, strong, readwrite) BNCPasteboard *pasteboard; @property (nonatomic, strong, readwrite) NSNumber *requestCreationTimeStamp; @property (nonatomic, strong, readwrite) NSString *requestUUID; @@ -67,7 +65,6 @@ - (instancetype)initWithBranchKey:(NSString *)key UUID:(NSString *)requestUUID T self.application = [BNCApplication currentApplication]; self.appGroupsData = [BNCAppGroupsData shared]; self.skAdNetwork = [BNCSKAdNetwork sharedInstance]; - self.appleReceipt = [BNCAppleReceipt sharedInstance]; self.pasteboard = [BNCPasteboard sharedInstance]; self.requestUUID = requestUUID; self.requestCreationTimeStamp = requestTimeStamp; @@ -103,7 +100,6 @@ - (NSDictionary *)dataForInstallWithURLString:(NSString *)urlString { [self addSystemObserverDataToJSON:json]; [self addPreferenceHelperDataToJSON:json]; [self addPartnerParametersToJSON:json]; - [self addAppleReceiptSourceToJSON:json]; [self addTimestampsToJSON:json]; // Check if the urlString is a valid URL to ensure it's a universal link, not the external intent uri @@ -119,7 +115,6 @@ - (NSDictionary *)dataForInstallWithURLString:(NSString *)urlString { [self addAppleAttributionTokenToJSON:json]; // Install Only - [self addAppleReceiptDataToJSON:json]; [self addAppClipDataToJSON:json]; [self addLocalURLToInstallJSON:json]; @@ -167,7 +162,6 @@ - (NSDictionary *)dataForOpenWithURLString:(NSString *)urlString { [self addSystemObserverDataToJSON:json]; [self addPreferenceHelperDataToJSON:json]; [self addPartnerParametersToJSON:json]; - [self addAppleReceiptSourceToJSON:json]; [self addTimestampsToJSON:json]; @@ -337,17 +331,6 @@ - (void)addSystemObserverDataToJSON:(NSMutableDictionary *)json { [self safeSetValue:[BNCSystemObserver applicationVersion] forKey:BRANCH_REQUEST_KEY_APP_VERSION onDict:json]; [self safeSetValue:[BNCSystemObserver defaultURIScheme] forKey:BRANCH_REQUEST_KEY_URI_SCHEME onDict:json]; } - -- (void)addAppleReceiptDataToJSON:(NSMutableDictionary *)json { - [self safeSetValue:[self.appleReceipt installReceipt] forKey:BRANCH_REQUEST_KEY_APPLE_RECEIPT onDict:json]; -} - -- (void)addAppleReceiptSourceToJSON:(NSMutableDictionary *)json { - NSNumber *isSandboxReceipt = [NSNumber numberWithBool:[self.appleReceipt isTestFlight]]; - - // The JSON key name is misleading, really indicates if the receipt is real or a sandbox receipt - [self safeSetValue:isSandboxReceipt forKey:BRANCH_REQUEST_KEY_APPLE_TESTFLIGHT onDict:json]; -} - (void)addAppleAttributionTokenToJSON:(NSMutableDictionary *)json { // This value is only sent once usually on install diff --git a/Sources/BranchSDK/BranchConstants.m b/Sources/BranchSDK/BranchConstants.m index d5ee04498..920583cbb 100644 --- a/Sources/BranchSDK/BranchConstants.m +++ b/Sources/BranchSDK/BranchConstants.m @@ -55,8 +55,6 @@ NSString * const BRANCH_REQUEST_KEY_IS_SIMULATOR = @"is_simulator"; NSString * const BRANCH_REQUEST_KEY_LOG = @"log"; NSString * const BRANCH_REQUEST_KEY_INSTRUMENTATION = @"instrumentation"; -NSString * const BRANCH_REQUEST_KEY_APPLE_RECEIPT = @"apple_receipt"; -NSString * const BRANCH_REQUEST_KEY_APPLE_TESTFLIGHT = @"apple_testflight"; NSString * const BRANCH_REQUEST_KEY_APP_CLIP_BUNDLE_ID = @"app_clip_bundle_id"; NSString * const BRANCH_REQUEST_KEY_LATEST_APP_CLIP_INSTALL_TIME = @"latest_app_clip_time"; diff --git a/Sources/BranchSDK/Private/BNCAppleReceipt.h b/Sources/BranchSDK/Private/BNCAppleReceipt.h deleted file mode 100644 index afeaf0c0e..000000000 --- a/Sources/BranchSDK/Private/BNCAppleReceipt.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// BNCAppleReceipt.h -// Branch -// -// Created by Ernest Cho on 7/11/19. -// Copyright © 2019 Branch, Inc. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif - -NS_ASSUME_NONNULL_BEGIN - -@interface BNCAppleReceipt : NSObject - -+ (BNCAppleReceipt *)sharedInstance; - -// this is only available on builds from Apple -- (nullable NSString *)installReceipt; -- (BOOL)isTestFlight; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Sources/BranchSDK/Private/BranchConstants.h b/Sources/BranchSDK/Private/BranchConstants.h index b08ec65f7..e5f634934 100644 --- a/Sources/BranchSDK/Private/BranchConstants.h +++ b/Sources/BranchSDK/Private/BranchConstants.h @@ -60,8 +60,6 @@ extern NSString * const BRANCH_REQUEST_KEY_IS_SIMULATOR; extern NSString * const BRANCH_REQUEST_KEY_LOG; extern NSString * const BRANCH_REQUEST_KEY_EXTERNAL_INTENT_URI; extern NSString * const BRANCH_REQUEST_KEY_INSTRUMENTATION; -extern NSString * const BRANCH_REQUEST_KEY_APPLE_RECEIPT; -extern NSString * const BRANCH_REQUEST_KEY_APPLE_TESTFLIGHT; extern NSString * const BRANCH_REQUEST_KEY_APP_CLIP_BUNDLE_ID; extern NSString * const BRANCH_REQUEST_KEY_LATEST_APP_CLIP_INSTALL_TIME;