diff --git a/BranchUnityTestBed/Assets/Branch/Branch.cs b/BranchUnityTestBed/Assets/Branch/Branch.cs index 2e9b26db..b0509ef0 100644 --- a/BranchUnityTestBed/Assets/Branch/Branch.cs +++ b/BranchUnityTestBed/Assets/Branch/Branch.cs @@ -7,7 +7,7 @@ public class Branch : MonoBehaviour { - public static string sdkVersion = "0.6.5"; + public static string sdkVersion = "0.6.6"; public delegate void BranchCallbackWithParams(Dictionary parameters, string error); public delegate void BranchCallbackWithUrl(string url, string error); diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK.meta index 1e88c098..055d498f 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: a5d186c48380c4d7cb60f0d33c7f11cc +guid: 0d1e44de376a04a7f8acbe84a344affb folderAsset: yes -timeCreated: 1513011739 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.h.meta index e3648e71..efda60eb 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 4f24404d1f47a41e08435ab36cce717e +guid: 9c3c561db72ff4d2089eec218e536969 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.m.meta index e8c2d946..30ff5836 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleAdClient.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: bce5fc4f2e8514d3a84a8ea2e62eeddc +guid: 4c0273a9c623b49f2950d97d0c33a507 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h.meta index 6755729a..5b1fab6d 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a2e118d97f244c269a6e83238e5b221 +guid: 81259155382504d5ba8e045406608bff PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,83 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.m.meta index d842b168..a4bee8a3 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 32c950d916bb542e6992aed6e9dd363e +guid: 16efa25b6fd634af0a2e2f1d6342b403 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,25 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -40,54 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h.meta index 42644d0e..1f517401 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 6fe54dfcc2d494f6f8d018725bebcf9b +guid: 687244ba6767740de80b105eb1676e10 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.m.meta index 02f7c4c7..9d912eaf 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: 7cc7b4d9fc5ee4e0ba99be96002e62fd +guid: 9a4b82dc972ae4d2ea3bde776dd40130 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.h.meta index 198fb52b..2625ed37 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5780ae8e91b554bd8b9ef92e3239439f +guid: 717be26883d25455cb9e5ff2af92ef4d PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,103 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m old mode 100755 new mode 100644 index 87f3eb87..16fbb00c --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m @@ -116,38 +116,48 @@ + (NSDate*) firstInstallBuildDate { return firstBuildDate; } -+ (NSDate*) currentInstallDate { ++ (NSDate *) currentInstallDate { + NSDate *installDate = [NSDate date]; + + #if !TARGET_OS_TV + // tvOS always returns a creation date of Unix epoch 0 on device + installDate = [self creationDateForLibraryDirectory]; + #endif + + if (installDate == nil || [installDate timeIntervalSince1970] <= 0.0) { + BNCLogWarning(@"Invalid install date, using [NSDate date]."); + } + return installDate; +} + ++ (NSDate *)creationDateForLibraryDirectory { NSError *error = nil; NSFileManager *fileManager = [NSFileManager defaultManager]; - NSURL *libraryURL = - [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] firstObject]; - NSDictionary *attributes = [fileManager attributesOfItemAtPath:libraryURL.path error:&error]; + NSURL *directoryURL = [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] firstObject]; + NSDictionary *attributes = [fileManager attributesOfItemAtPath:directoryURL.path error:&error]; if (error) { - BNCLogError(@"Can't get library date: %@.", error); - return nil; - } - NSDate *installDate = [attributes fileCreationDate]; - if (installDate == nil || [installDate timeIntervalSince1970] <= 0.0) { - BNCLogError(@"Invalid install date."); + BNCLogError(@"Can't get creation date for Library directory: %@", error); + return nil; } - return installDate; + return [attributes fileCreationDate]; } + (NSDate*) firstInstallDate { + // check keychain for stored install date, on iOS this is lost on app deletion. NSError *error = nil; - NSDate* firstInstallDate = - [BNCKeyChain retrieveValueForService:kBranchKeychainService - key:kBranchKeychainFirstInstalldKey - error:&error]; - if (firstInstallDate) + NSDate* firstInstallDate = [BNCKeyChain retrieveValueForService:kBranchKeychainService key:kBranchKeychainFirstInstalldKey error:&error]; + if (firstInstallDate) { return firstInstallDate; - + } + + // check filesytem for creation date firstInstallDate = [self currentInstallDate]; - error = [BNCKeyChain storeValue:firstInstallDate - forService:kBranchKeychainService - key:kBranchKeychainFirstInstalldKey - cloudAccessGroup:nil]; - if (error) BNCLogError(@"Keychain store: %@.", error); + + // save filesystem time to keychain + error = [BNCKeyChain storeValue:firstInstallDate forService:kBranchKeychainService key:kBranchKeychainFirstInstalldKey cloudAccessGroup:nil]; + if (error) { + BNCLogError(@"Keychain store: %@.", error); + } return firstInstallDate; } diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m.meta index a28e97b7..edadd92a 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCApplication.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cad947d43ca414c7aac28dfdec82fa20 +guid: 2941ea24f45d24aef8b9baf16a4aee5e PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,28 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -43,65 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.h.meta index eb09b7bd..70b5564f 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 01e3f199d14554db58026b58ff47c504 +guid: 632d8029f36ae4a259f320a51ca6941b PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.m.meta index 89b96bb2..1a8f9963 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAvailability.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c41a1e8c14634cfeb53d38701d29d71 +guid: 95b50cfb02d9e4b9ab890723e5eafa62 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.h new file mode 100644 index 00000000..a58dd3db --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.h @@ -0,0 +1,26 @@ +// +// BNCCallbackMap.h +// Branch +// +// Created by Ernest Cho on 2/25/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import +#import "BNCServerRequest.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface BNCCallbackMap : NSObject + ++ (instancetype)shared; + +- (void)storeRequest:(BNCServerRequest *)request withCompletion:(void (^_Nullable)(BOOL success, NSError * _Nullable error))completion; + +- (BOOL)containsRequest:(BNCServerRequest *)request; + +- (void)callCompletionForRequest:(BNCServerRequest *)request withSuccessStatus:(BOOL)status error:(nullable NSError *)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.h.meta new file mode 100644 index 00000000..40de8ea6 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 6ff66735f079a4643b19d517da3d920d +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.m new file mode 100644 index 00000000..8c180382 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.m @@ -0,0 +1,57 @@ +// +// BNCCallbackMap.m +// Branch +// +// Created by Ernest Cho on 2/25/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import "BNCCallbackMap.h" + +@interface BNCCallbackMap() +@property (nonatomic, strong, readwrite) NSMapTable *callbacks; +@end + +@implementation BNCCallbackMap + ++ (instancetype)shared { + static BNCCallbackMap *map; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + map = [BNCCallbackMap new]; + }); + return map; +} + +- (instancetype)init { + self = [super init]; + if (self) { + + // the key is a weak pointer to the request object + // the value is a strong pointer to the request callback block + // if the request object becomes nil, the callback block is lost + self.callbacks = [NSMapTable mapTableWithKeyOptions:NSMapTableWeakMemory valueOptions:NSMapTableStrongMemory]; + } + return self; +} + +- (void)storeRequest:(BNCServerRequest *)request withCompletion:(void (^_Nullable)(BOOL success, NSError * _Nullable error))completion { + [self.callbacks setObject:completion forKey:request]; +} + +- (BOOL)containsRequest:(BNCServerRequest *)request { + BOOL contains = NO; + if ([self.callbacks objectForKey:request] != nil) { + contains = YES; + } + return contains; +} + +- (void)callCompletionForRequest:(BNCServerRequest *)request withSuccessStatus:(BOOL)status error:(nullable NSError *)error { + void (^completion)(BOOL, NSError * _Nullable) = [self.callbacks objectForKey:request]; + if (completion) { + completion(status, error); + } +} + +@end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.m.meta new file mode 100644 index 00000000..3e15baf3 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbackMap.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: a5bcb7a337ac3449598186c8a4c44383 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbacks.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbacks.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbacks.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbacks.h.meta index fd1b1a91..22af0f5d 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbacks.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCallbacks.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c00a49c09bc54d2daefcaab4ba39d9a +guid: 7f46442c6c21c48cfa000925f25cf150 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.h.meta index 14e9198c..7483359b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02ea4553c45fa4099b40c7e98220ff25 +guid: aeecddd4bf18f4dd6b0874795e23628e PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.m.meta index 79fbfdbb..d766c754 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCommerceEvent.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 368c4ca35e0f24844b05a7900ba64a8c +guid: da27270f940bc4d1bb421f6d077098e6 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h old mode 100755 new mode 100644 index 24ec157b..1955dd50 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h @@ -15,6 +15,5 @@ FOUNDATION_EXPORT NSString*_Nonnull const BNC_SDK_VERSION; FOUNDATION_EXPORT NSString*_Nonnull const BNC_API_BASE_URL; -FOUNDATION_EXPORT BOOL const BNC_API_PINNED; FOUNDATION_EXPORT NSString*_Nonnull const BNC_API_VERSION; FOUNDATION_EXPORT NSString*_Nonnull const BNC_LINK_URL; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h.meta index 126ca684..2e2e949e 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41f6adc2e41cc46c4917eb3d480ac8c2 +guid: 4e1106a5306cd4d4dae4f84c5b7ca900 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m old mode 100755 new mode 100644 index 37340254..d5602dcf --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m @@ -9,7 +9,6 @@ #include "BNCConfig.h" NSString * const BNC_API_BASE_URL = @"https://api2.branch.io"; -BOOL const BNC_API_PINNED = NO; NSString * const BNC_API_VERSION = @"v1"; NSString * const BNC_LINK_URL = @"https://bnc.lt"; -NSString * const BNC_SDK_VERSION = @"0.31.4"; +NSString * const BNC_SDK_VERSION = @"0.35.0"; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m.meta index 50801595..dc7fdc27 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 905c7a09866114d77854c6a6e0483c80 +guid: e0bf630609f4d48c29c8770131ac8330 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.h.meta index afa4d39d..825bc85a 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e6a4564aed02480cb48272f0760ae83 +guid: 5b31ec4cb90db4a6aa1a2a00a22f0939 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m.meta index 9c1f827f..66bfb0fc 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4264249cd0d8a42c6afe3fe924d6a41c +guid: cdd2a31bbdf1c420ebd796a0801d13b2 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.h.meta index f1d05b0a..5fdb806d 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66361b546839a47d88c6f4b69fad45ea +guid: 817fad03ecdcd41c09acdd319da02d2e PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.m.meta index 98f5f572..7bae7f09 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCCrashlyticsWrapper.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90f9d06fb58eb457b8d18126bdcc56cd +guid: 16240c282b94c4d8fad3f6a0d58f9567 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.h.meta index 072fc10c..efd69dc1 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02de784e874734abc9cd576b89f818a0 +guid: bb2915b73ca4349e3b575573f3b13ddf PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.m.meta index f41444c4..0de33666 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDebug.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3135c0d8e9394b4a8efd98545bf099b +guid: 42a9ca243d42847cfa4dc4c3264629ea PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.h.meta index 93d40b33..45032cad 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb22ad77406ff4b3ba8ccda2739413e5 +guid: d707c3278eb174a7daeb67d8605679d3 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.m.meta index 5970dff1..bed06994 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeepLinkViewControllerInstance.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5e85271acc344e48860577719697e19 +guid: 52dea9850c54642efab342748d60a19b PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h.meta index 0df7132f..b0da7981 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a36a5d995d2c460990c8bd1c2938159 +guid: cb7100bb7bbf24657a2b5c6ca8d5907b PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m old mode 100755 new mode 100644 index 19e1f5f4..a189f7dd --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m @@ -12,13 +12,17 @@ #import "BNCLog.h" #import "BNCConfig.h" #import "BNCNetworkInterface.h" -#import "BNCUserAgentCollector.h" -#import "BNCTelephony.h" #import "BNCReachability.h" #import "BNCLocale.h" #import "NSMutableDictionary+Branch.h" #import "BNCDeviceSystem.h" +#if !TARGET_OS_TV +// tvOS does not support webkit or telephony +#import "BNCTelephony.h" +#import "BNCUserAgentCollector.h" +#endif + #if __has_feature(modules) @import UIKit; #else @@ -29,8 +33,6 @@ @interface BNCDeviceInfo() -@property (nonatomic, strong, readwrite) BNCReachability *reachability; - @property (nonatomic, copy, readwrite) NSString *randomId; @end @@ -62,33 +64,34 @@ - (void)registerPluginName:(NSString *)name version:(NSString *)version { } - (void)loadDeviceInfo { - + BNCLocale *locale = [BNCLocale new]; - BNCTelephony *telephony = [BNCTelephony new]; BNCDeviceSystem *deviceSystem = [BNCDeviceSystem new]; - - self.reachability = [BNCReachability new]; - + // The random id is regenerated per app launch. This maintains existing behavior. self.randomId = [[NSUUID UUID] UUIDString]; self.vendorId = [BNCSystemObserver getVendorId]; [self checkAdvertisingIdentifier]; - + self.brandName = [BNCSystemObserver getBrand]; self.modelName = [BNCSystemObserver getModel]; self.osName = [BNCSystemObserver getOS]; self.osVersion = [BNCSystemObserver getOSVersion]; self.osBuildVersion = deviceSystem.systemBuildVersion; - + if (deviceSystem.cpuType) { self.cpuType = [deviceSystem.cpuType stringValue]; } - + self.screenWidth = [BNCSystemObserver getScreenWidth]; self.screenHeight = [BNCSystemObserver getScreenHeight]; self.screenScale = @([UIScreen mainScreen].scale); + + #if !TARGET_OS_TV + BNCTelephony *telephony = [BNCTelephony new]; self.carrierName = telephony.carrierName; - + #endif + self.locale = [NSLocale currentLocale].localeIdentifier; self.country = [locale country]; self.language = [locale language]; @@ -114,11 +117,16 @@ - (NSString *)localIPAddress { } - (NSString *)connectionType { - return [self.reachability reachabilityStatus]; + return [[BNCReachability shared] reachabilityStatus]; } - (NSString *)userAgentString { + #if !TARGET_OS_TV return [BNCUserAgentCollector instance].userAgent; + #else + // tvOS has no web browser or webview + return @""; + #endif } // IDFA should never be cached @@ -126,17 +134,17 @@ - (void)checkAdvertisingIdentifier { self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe]; self.advertiserId = [BNCSystemObserver getAdId]; BOOL ignoreIdfa = [BNCPreferenceHelper preferenceHelper].isDebug; - + if (self.advertiserId && !ignoreIdfa) { self.hardwareId = self.advertiserId; self.hardwareIdType = @"idfa"; self.isRealHardwareId = YES; - + } else if (self.vendorId) { self.hardwareId = self.vendorId; self.hardwareIdType = @"vendor_id"; self.isRealHardwareId = YES; - + } else { self.hardwareId = self.randomId; self.hardwareIdType = @"random"; @@ -148,19 +156,24 @@ - (NSDictionary *)v2dictionary { NSMutableDictionary *dictionary = [NSMutableDictionary new]; @synchronized (self) { [self checkAdvertisingIdentifier]; - + + BOOL disableAdNetworkCallouts = [BNCPreferenceHelper preferenceHelper].disableAdNetworkCallouts; + if (disableAdNetworkCallouts) { + dictionary[@"disable_ad_network_callouts"] = [NSNumber numberWithBool:disableAdNetworkCallouts]; + } + if ([BNCPreferenceHelper preferenceHelper].isDebug) { dictionary[@"unidentified_device"] = @(YES); } else { [dictionary bnc_safeSetObject:self.vendorId forKey:@"idfv"]; [dictionary bnc_safeSetObject:self.advertiserId forKey:@"idfa"]; } - [dictionary bnc_safeSetObject:[BNCNetworkInterface localIPAddress] forKey:@"local_ip"]; - + [dictionary bnc_safeSetObject:[self localIPAddress] forKey:@"local_ip"]; + if (!self.isAdTrackingEnabled) { dictionary[@"limit_ad_tracking"] = @(YES); } - + if ([BNCPreferenceHelper preferenceHelper].limitFacebookTracking) { dictionary[@"limit_facebook_tracking"] = @(YES); } @@ -179,13 +192,13 @@ - (NSDictionary *)v2dictionary { [dictionary bnc_safeSetObject:self.language forKey:@"language"]; [dictionary bnc_safeSetObject:self.carrierName forKey:@"device_carrier"]; [dictionary bnc_safeSetObject:[self connectionType] forKey:@"connection_type"]; - [dictionary bnc_safeSetObject:[BNCUserAgentCollector instance].userAgent forKey:@"user_agent"]; + [dictionary bnc_safeSetObject:[self userAgentString] forKey:@"user_agent"]; [dictionary bnc_safeSetObject:[BNCPreferenceHelper preferenceHelper].userIdentity forKey:@"developer_identity"]; [dictionary bnc_safeSetObject:[BNCPreferenceHelper preferenceHelper].deviceFingerprintID forKey:@"device_fingerprint_id"]; - + [dictionary bnc_safeSetObject:self.applicationVersion forKey:@"app_version"]; - + [dictionary bnc_safeSetObject:self.pluginName forKey:@"plugin_name"]; [dictionary bnc_safeSetObject:self.pluginVersion forKey:@"plugin_version"]; dictionary[@"sdk_version"] = BNC_SDK_VERSION; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m.meta index 2f3ec2af..8407a474 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0951341251d4a47a8b54397dc738bf2e +guid: 76adbabd327cb4db68f6dff0f4f360d0 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.h.meta index 9e883e96..64807fb8 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 65b005a1bccd448a5936e7db537f96f1 +guid: 8b9943f9d7b9744f985879e7e1f2f422 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.m.meta index 27edf21d..f87e40e2 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceSystem.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: 8588d7c949a7143be894285abfa036e9 +guid: 6da29fab651ff410296e054754990dfe PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h old mode 100755 new mode 100644 index 34ecf5b5..6208d5f8 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h @@ -42,7 +42,7 @@ extern NSString* BNCWireFormatFromString(NSString *string); + (NSString *)base64EncodeData:(NSData *)objData; + (NSData *)base64DecodeString:(NSString *)strBase64; -+ (NSString *)md5Encode:(NSString *)input; ++ (NSString *)sha256Encode:(NSString *)input; + (NSString *)urlEncodedString:(NSString *)string; + (NSString *)encodeArrayToJsonString:(NSArray *)dictionary; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h.meta index 54119dbe..8af2b1e7 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35f17a3fe0aa64b58b8a15a5ace2c732 +guid: 2634b4e5caccd4e839a1508d375f9369 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m old mode 100755 new mode 100644 index 268b1872..33fdb367 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m @@ -105,20 +105,20 @@ + (NSData *)base64DecodeString:(NSString *)strBase64 { return nil; } -#pragma mark - MD5 methods +#pragma mark - SHA 256 methods -+ (NSString *)md5Encode:(NSString *)input { ++ (NSString *)sha256Encode:(NSString *)input { if (!input) { return @""; } - - const char *cStr = [input UTF8String]; - unsigned char digest[CC_MD5_DIGEST_LENGTH]; - CC_MD5(cStr, (CC_LONG)strlen(cStr), digest); - NSMutableString *output = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2]; + const char *cStr = [input UTF8String]; + unsigned char digest[CC_SHA256_DIGEST_LENGTH]; + CC_SHA256(cStr, (CC_LONG)strlen(cStr), digest); + + NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA256_DIGEST_LENGTH * 2]; - for (int i = 0; i < CC_MD5_DIGEST_LENGTH; i++) { + for (int i = 0; i < CC_SHA256_DIGEST_LENGTH; i++) { [output appendFormat:@"%02x", digest[i]]; } @@ -362,7 +362,7 @@ + (NSDictionary *)decodeJsonStringToDictionary:(NSString *)jsonString { } NSDictionary *plainDecodedDictionary = [NSJSONSerialization JSONObjectWithData:tempData options:NSJSONReadingMutableContainers error:nil]; - if (plainDecodedDictionary) { + if (plainDecodedDictionary && [plainDecodedDictionary isKindOfClass:[NSDictionary class]]) { return plainDecodedDictionary; } @@ -374,7 +374,7 @@ + (NSDictionary *)decodeJsonStringToDictionary:(NSString *)jsonString { } NSDictionary *base64DecodedDictionary = [NSJSONSerialization JSONObjectWithData:tempData options:NSJSONReadingMutableContainers error:nil]; - if (base64DecodedDictionary) { + if (base64DecodedDictionary && [base64DecodedDictionary isKindOfClass:[NSDictionary class]]) { return base64DecodedDictionary; } diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m.meta index 8b2b8ccd..30979a3a 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCEncodingUtils.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 57624efca6a5f4b9ebf0d5d5421ad0a2 +guid: b95e326ded22e427097b0be8cb16fc2c PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.h.meta index 77447d3f..c2869535 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 04e57baa00128436a9f53278db4281d2 +guid: 9874f00cde828401b969a4fde9b53760 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m.meta index 41e50f2f..807f52a1 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: 73eeb13a9dcdc4bc9839ec4ce975429a +guid: 6f7fea82a46ee49ae9276043a2caf4ef PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFieldDefines.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFieldDefines.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFieldDefines.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFieldDefines.h.meta index 95b9226d..bc64da57 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFieldDefines.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCFieldDefines.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 073d46e25fa2e46aab722b0c35ea40c1 +guid: 4933a190bc2f74e64901bdce9ec20b65 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.h new file mode 100644 index 00000000..93731521 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.h @@ -0,0 +1,26 @@ +// +// BNCInitSessionResponse.h +// Branch +// +// Created by Ernest Cho on 3/30/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import +#import "BranchUniversalObject.h" +#import "BranchLinkProperties.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface BNCInitSessionResponse : NSObject + +@property (nonatomic, strong, readwrite) NSDictionary *params; +@property (nonatomic, strong, readwrite) BranchUniversalObject *universalObject; +@property (nonatomic, strong, readwrite) BranchLinkProperties *linkProperties; + +@property (nonatomic, copy, readwrite) NSString *sceneIdentifier; +@property (nonatomic, strong, readwrite) NSError *error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.h.meta new file mode 100644 index 00000000..75f73020 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 8303a0a014771496db10a6fc5acbcd41 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.m new file mode 100644 index 00000000..52cc81db --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.m @@ -0,0 +1,13 @@ +// +// BNCInitSessionResponse.m +// Branch +// +// Created by Ernest Cho on 3/30/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import "BNCInitSessionResponse.h" + +@implementation BNCInitSessionResponse + +@end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.m.meta new file mode 100644 index 00000000..33beaebf --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCInitSessionResponse.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: eef6d961cb5e247fd93897e6bba6c679 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.h.meta index bf557328..2c522fc1 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3b71ba133dd714aa38790dc538eafe2d +guid: ce076bd31681a47a4a01533d6498d1c2 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,83 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.m.meta index 720e86e3..5521f828 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCJSONUtility.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2a6682db40dc43a4a0e56645c560654 +guid: acec257d65b2f4ec69544830a3f25d45 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,25 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -40,54 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.h.meta index 99684571..542e5d4b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3306aa226e77542a6aafb91e3834794c +guid: 5aa6434a31c82472b86acdbae66981e0 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,103 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m old mode 100755 new mode 100644 index 1b931012..c0b22476 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m @@ -227,6 +227,7 @@ + (NSString*_Nullable) securityAccessGroup { NSDictionary* dictionary = @{ (__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword, + (__bridge id)kSecAttrService: @"BranchKeychainService", (__bridge id)kSecReturnAttributes: (__bridge id)kCFBooleanTrue, (__bridge id)kSecAttrSynchronizable: (__bridge id)kSecAttrSynchronizableAny, (__bridge id)kSecMatchLimit: (__bridge id)kSecMatchLimitOne diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m.meta index 974941c2..9566dc77 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCKeyChain.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a88241fb97a364d6f9dea411f696850a +guid: 7b2415c637850406fa6674566b9c8ea5 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,28 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -43,65 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.h.meta index 92f6d511..f57f7da3 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6afdf575f5ac54f00bf01134c78fb935 +guid: e3347580bd09a4b449752f1133496a36 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.m.meta index 19cfca01..ff2fe0d4 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkCache.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d43b552bb83ab443ebd57e9e8f66ce1e +guid: 1202a5a5a267c464e99135d5a83ea136 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.h.meta index ae9a6068..98ac985b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 524020b0cf6514707bdab3ce9ecba053 +guid: 8575e707ef3aa4fba8c9f8382b4e58de PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m old mode 100755 new mode 100644 index 0a37194c..047406ed --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m @@ -122,16 +122,16 @@ - (NSUInteger)hash { NSString *encodedParams = [BNCEncodingUtils encodeDictionaryToJsonString:self.params]; result = prime * result + self.type; - result = prime * result + [[BNCEncodingUtils md5Encode:self.alias] hash]; - result = prime * result + [[BNCEncodingUtils md5Encode:self.channel] hash]; - result = prime * result + [[BNCEncodingUtils md5Encode:self.feature] hash]; - result = prime * result + [[BNCEncodingUtils md5Encode:self.stage] hash]; - result = prime * result + [[BNCEncodingUtils md5Encode:self.campaign] hash]; - result = prime * result + [[BNCEncodingUtils md5Encode:encodedParams] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:self.alias] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:self.channel] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:self.feature] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:self.stage] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:self.campaign] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:encodedParams] hash]; result = prime * result + self.duration; for (NSString *tag in self.tags) { - result = prime * result + [[BNCEncodingUtils md5Encode:tag] hash]; + result = prime * result + [[BNCEncodingUtils sha256Encode:tag] hash]; } return result; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m.meta index 1e8d2248..03081d50 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLinkData.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 637877d7341ac4b0f9d43137062891a3 +guid: 83cbb784170fd40d49adf1ce97f7204b PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.h.meta index 5779d2fb..d63fd723 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 488399633731642ec8f656961e295eed +guid: 1a16a3b068c104725bc09f69634a05b8 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m old mode 100755 new mode 100644 index a0abdbdf..7c22df4d --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m @@ -26,7 +26,7 @@ - (nullable NSString *)country { - (nullable NSString *)countryOS10 { NSString *country = nil; - if (@available(iOS 10, *)) { + if (@available(iOS 10, tvOS 10, *)) { country = [[NSLocale currentLocale] countryCode]; } return country; @@ -63,7 +63,7 @@ - (nullable NSString *)language { - (nullable NSString *)languageOS10 { NSString *language = nil; - if (@available(iOS 10, *)) { + if (@available(iOS 10, tvOS 10, *)) { language = [[NSLocale currentLocale] languageCode]; } return language; @@ -71,11 +71,11 @@ - (nullable NSString *)languageOS10 { - (nullable NSString *)languageOS9 { NSString *language = nil; - if (@available(iOS 9, *)) { - NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject]; - NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage]; - language = [languageDictionary objectForKey:@"kCFLocaleLanguageCodeKey"]; - } + + NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject]; + NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage]; + language = [languageDictionary objectForKey:@"kCFLocaleLanguageCodeKey"]; + return language; } diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m.meta index 9c324272..78a3c74b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocale.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: aad23d851d69b4607b3752345bda0ac0 +guid: d40a3e075bc0c445f8f90ed656501547 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.h.meta index 95e964e8..25c5293f 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8cdc689e308049f5bc10a7b4f1a7c7b +guid: fb912f796367c4cc3a2f8acbb62686d3 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.m.meta index 67dad8db..63607272 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLocalization.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e76554fc5f9c4e208adc001d7ae22e7 +guid: 81a9ca280c2b14e2a8cb11748be396de PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.h.meta index c34ae777..5ba0f9a9 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f0aedd2907e9b4036ab8f1c0840d65a2 +guid: e805d9bdec075488a9b6a5a043d59437 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.m.meta index 4d55f262..14d8e045 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCLog.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d6c95e659e344671ac3c80e0944f443 +guid: 9fe998f63599a435d839e5c5ee0449ea PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.h.meta index b854b53f..2367bef3 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: de414769e62554036be9b69c687699f2 +guid: 4b01b40596c8246e088d131e0968ebdc PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.m.meta index 29830bde..ca7d3710 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkInterface.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: e4e8165a3054d488ea59f250110c1b71 +guid: a9b35f448294f4beab4a1fb00f437a04 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.h old mode 100755 new mode 100644 similarity index 94% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.h index 17e65567..3994b5f1 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.h @@ -32,7 +32,7 @@ #pragma mark - BNCNetworkService -@interface BNCNetworkService : NSObject +@interface BNCNetworkService : NSObject + (instancetype) new; - (void) cancelAllOperations; @@ -40,7 +40,5 @@ - (BNCNetworkOperation*) networkOperationWithURLRequest:(NSMutableURLRequest*)request completion:(void (^)(idoperation))completion; -- (NSError*) pinSessionToPublicSecKeyRefs:(NSArray/***/*)publicKeys; - @property (strong) NSDictionary *userInfo; @end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.h.meta new file mode 100644 index 00000000..c96cf921 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 7a49e33b2d61447d8818e4bead929214 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.m old mode 100755 new mode 100644 similarity index 71% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.m index 64f5eeaa..e404fbb6 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.m @@ -11,7 +11,6 @@ #import "BNCLog.h" #import "BNCDebug.h" #import "NSError+Branch.h" -#import "BNCConfig.h" #pragma mark BNCNetworkOperation @@ -29,11 +28,10 @@ @interface BNCNetworkOperation () #pragma mark - BNCNetworkService -@interface BNCNetworkService () { +@interface BNCNetworkService () { NSURLSession *_session; NSTimeInterval _defaultTimeoutInterval; NSInteger _maximumConcurrentOperations; - NSMutableArray *_pinnedPublicKeys; } - (void) startOperation:(BNCNetworkOperation*)operation; @@ -89,26 +87,6 @@ - (instancetype) init { #pragma mark - Getters & Setters -- (NSError*) pinSessionToPublicSecKeyRefs:(NSArray/***/*)publicKeys { - @synchronized (self) { - _pinnedPublicKeys = [NSMutableArray array]; - for (id secKey in publicKeys) { - if (CFGetTypeID((SecKeyRef)secKey) == SecKeyGetTypeID()) - [_pinnedPublicKeys addObject:secKey]; - else { - return [NSError branchErrorWithCode:BNCInvalidNetworkPublicKeyError]; - } - } - return nil; - } -} - -- (NSArray*) pinnedPublicKeys { - @synchronized (self) { - return _pinnedPublicKeys; - } -} - - (void) setDefaultTimeoutInterval:(NSTimeInterval)defaultTimeoutInterval { @synchronized (self) { _defaultTimeoutInterval = MAX(defaultTimeoutInterval, 0.0); @@ -240,70 +218,4 @@ - (void) cancelAllOperations { } } -- (void) URLSession:(NSURLSession *)session - task:(NSURLSessionTask *)task -didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge - completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler { - - BOOL trusted = NO; - SecTrustResultType trustResult = 0; - OSStatus err = 0; - NSArray *localPinnedKeys = self.pinnedPublicKeys; // Keep a local copy in case it mutates. - - // Release these: - SecKeyRef key = nil; - SecPolicyRef hostPolicy = nil; - - // Get remote certificate - SecTrustRef serverTrust = challenge.protectionSpace.serverTrust; - @synchronized ((__bridge id)serverTrust) { - - // Set SSL policies for domain name check - hostPolicy = SecPolicyCreateSSL(true, (__bridge CFStringRef)challenge.protectionSpace.host); - if (!hostPolicy) goto exit; - SecTrustSetPolicies(serverTrust, (__bridge CFTypeRef _Nonnull)(@[ (__bridge id)hostPolicy ])); - - // Evaluate server certificate - SecTrustEvaluate(serverTrust, &trustResult); - if (! (trustResult == kSecTrustResultUnspecified || trustResult == kSecTrustResultProceed)) { - goto exit; - } - - if (localPinnedKeys.count == 0) { - trusted = YES; - goto exit; - } - - key = SecTrustCopyPublicKey(serverTrust); - if (!key) goto exit; - } - - for (id pinnedKey in localPinnedKeys) { - if ([pinnedKey isEqual:(__bridge id)key]) { - trusted = YES; - goto exit; - } - } - - if (!BNC_API_PINNED) { - trusted = YES; - goto exit; - } - -exit: - if (err) { - NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:err userInfo:nil]; - BNCLogError(@"Error while validating cert: %@.", error); - } - if (key) CFRelease(key); - if (hostPolicy) CFRelease(hostPolicy); - - if (trusted) { - NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust]; - completionHandler(NSURLSessionAuthChallengeUseCredential, credential); - } else { - completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, NULL); - } -} - @end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.m.meta new file mode 100644 index 00000000..3a716da6 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkService.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 26b367d5b548749bb86e76b76d09df1c +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkServiceProtocol.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkServiceProtocol.h old mode 100755 new mode 100644 similarity index 99% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkServiceProtocol.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkServiceProtocol.h index 725e2207..46e57ef2 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkServiceProtocol.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkServiceProtocol.h @@ -113,6 +113,6 @@ /// Pins the session to the array of public keys. @optional -- (NSError*) pinSessionToPublicSecKeyRefs:(NSArray/***/*)publicKeys; +- (NSError*) pinSessionToPublicSecKeyRefs:(NSArray/***/*)publicKeys __deprecated; @end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkServiceProtocol.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkServiceProtocol.h.meta new file mode 100644 index 00000000..6902cf2e --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCNetworkServiceProtocol.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: ca33b54eef6a24aedab58bdf2e63c12c +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h old mode 100755 new mode 100644 index cb248af3..e3441b25 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h @@ -49,6 +49,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void); @property (nonatomic, strong, readwrite) NSString *branchBlacklistURL; @property (assign, atomic) BOOL limitFacebookTracking; @property (strong, atomic) NSDate *previousAppBuildDate; +@property (assign, nonatomic, readwrite) BOOL disableAdNetworkCallouts; @property (strong, nonatomic, readwrite) NSURL *faceBookAppLink; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h.meta index 71a17fc3..a799a308 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f83f497b34a7643ee88c88cda03ce9eb +guid: 198b1ebc91c6e4471a0161fbf73086f4 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m old mode 100755 new mode 100644 index e521c1f2..ba6055fb --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m @@ -97,19 +97,19 @@ + (BNCPreferenceHelper *)preferenceHelper { return preferenceHelper; } -- (id)init { +- (instancetype)init { self = [super init]; - if (!self) return self; + if (self) { + _timeout = DEFAULT_TIMEOUT; + _retryCount = DEFAULT_RETRY_COUNT; + _retryInterval = DEFAULT_RETRY_INTERVAL; + _isDebug = NO; + _persistPrefsQueue = [[NSOperationQueue alloc] init]; + _persistPrefsQueue.maxConcurrentOperationCount = 1; - _timeout = DEFAULT_TIMEOUT; - _retryCount = DEFAULT_RETRY_COUNT; - _retryInterval = DEFAULT_RETRY_INTERVAL; - _isDebug = NO; - _persistPrefsQueue = [[NSOperationQueue alloc] init]; - _persistPrefsQueue.maxConcurrentOperationCount = 1; - - self.branchBlacklistURL = @"https://cdn.branch.io"; - + self.branchBlacklistURL = @"https://cdn.branch.io"; + self.disableAdNetworkCallouts = NO; + } return self; } @@ -778,19 +778,20 @@ - (NSMutableDictionary *)persistenceDict { NSDictionary *persistenceDict = nil; @try { NSError *error = nil; - NSData *data = [NSData dataWithContentsOfURL:self.class.URLForPrefsFile - options:0 error:&error]; - if (!error && data) + NSData *data = [NSData dataWithContentsOfURL:self.class.URLForPrefsFile options:0 error:&error]; + if (!error && data) { persistenceDict = [NSKeyedUnarchiver unarchiveObjectWithData:data]; + } } @catch (NSException*) { BNCLogWarning(@"Failed to load preferences from storage."); } - if ([persistenceDict isKindOfClass:[NSDictionary class]]) + if ([persistenceDict isKindOfClass:[NSDictionary class]]) { _persistenceDict = [persistenceDict mutableCopy]; - else + } else { _persistenceDict = [[NSMutableDictionary alloc] init]; + } } return _persistenceDict; } @@ -806,16 +807,30 @@ - (NSObject *)readObjectFromDefaults:(NSString *)key { - (NSString *)readStringFromDefaults:(NSString *)key { @synchronized(self) { id str = self.persistenceDict[key]; + + // protect against NSNumber if ([str isKindOfClass:[NSNumber class]]) { str = [str stringValue]; } + + // protect against anything else + if (![str isKindOfClass:[NSString class]]) { + str = nil; + } + return str; } } - (BOOL)readBoolFromDefaults:(NSString *)key { @synchronized(self) { - BOOL boo = [self.persistenceDict[key] boolValue]; + BOOL boo = NO; + + NSNumber *boolean = self.persistenceDict[key]; + if ([boolean respondsToSelector:@selector(boolValue)]) { + boo = [boolean boolValue]; + } + return boo; } } @@ -823,7 +838,7 @@ - (BOOL)readBoolFromDefaults:(NSString *)key { - (NSInteger)readIntegerFromDefaults:(NSString *)key { @synchronized(self) { NSNumber *number = self.persistenceDict[key]; - if (number != nil) { + if (number != nil && [number respondsToSelector:@selector(integerValue)]) { return [number integerValue]; } return NSNotFound; @@ -896,27 +911,35 @@ + (void) initialize { if (success) { return branchURL; } else { - NSLog(@"[branch.io] Info: CreateBranchURL failed: %@ URL: %@.", error, branchURL); + // BNCLog is dependent on BNCCreateDirectoryForBranchURLWithSearchPath_Unthreaded and cannot be used to log errors from it. + NSLog(@"CreateBranchURL failed: %@ URL: %@.", error, branchURL); } } return nil; } NSURL* _Nonnull BNCURLForBranchDirectory_Unthreaded() { + #if TARGET_OS_TV + // tvOS only allows the caches or temp directory + NSArray *kSearchDirectories = @[ + @(NSCachesDirectory) + ]; + #else NSArray *kSearchDirectories = @[ @(NSApplicationSupportDirectory), @(NSLibraryDirectory), @(NSCachesDirectory), @(NSDocumentDirectory), ]; - + #endif + for (NSNumber *directory in kSearchDirectories) { NSSearchPathDirectory directoryValue = [directory unsignedLongValue]; NSURL *URL = BNCCreateDirectoryForBranchURLWithSearchPath_Unthreaded(directoryValue); if (URL) return URL; } - // Worst case backup plan: + // Worst case backup plan. This does NOT work on tvOS. NSString *path = [@"~/Library/io.branch" stringByExpandingTildeInPath]; NSURL *branchURL = [NSURL fileURLWithPath:path isDirectory:YES]; NSFileManager *fileManager = [NSFileManager defaultManager]; @@ -928,7 +951,8 @@ + (void) initialize { attributes:nil error:&error]; if (!success) { - NSLog(@"[io.branch] Error: Worst case CreateBranchURL error was: %@ URL: %@.", error, branchURL); + // BNCLog is dependent on BNCURLForBranchDirectory_Unthreaded and cannot be used to log errors from it. + NSLog(@"Worst case CreateBranchURL error was: %@ URL: %@.", error, branchURL); } return branchURL; } diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m.meta index 598ef644..469a26e0 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCPreferenceHelper.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b6d868ac90014258b4d65239937a3ef +guid: c181bd6e1ed1f4c45bd8a861b8a10033 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h old mode 100755 new mode 100644 index a7601c78..67050d58 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h @@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN // Handles network connectivity and type information @interface BNCReachability : NSObject ++ (BNCReachability *)shared; + - (nullable NSString *)reachabilityStatus; @end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h.meta index 96fe668d..b6cf741b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 9a1814c8a508e429e8fb2cbaf3c732a4 +guid: 0f7e3255fe9b94f28be652fafd35f43f PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m old mode 100755 new mode 100644 index 0a899ea2..d1516c78 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m @@ -27,6 +27,15 @@ @interface BNCReachability() */ @implementation BNCReachability ++ (BNCReachability *)shared { + static BNCReachability *reachability; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + reachability = [BNCReachability new]; + }); + return reachability; +} + - (instancetype)init { self = [super init]; if (self) { diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m.meta index 7f1ed976..2b27bb2e 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCReachability.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: 3b8d6dc8e25bf4f438023d85a584bcbb +guid: 49b03d5be8e7841fb989c17d53ab363a PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.h new file mode 100644 index 00000000..b897155a --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.h @@ -0,0 +1,25 @@ +// +// BNCSKAdNetwork.h +// Branch +// +// Created by Ernest Cho on 8/12/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface BNCSKAdNetwork : NSObject + +@property (nonatomic, assign, readwrite) NSTimeInterval maxTimeSinceInstall; + ++ (BNCSKAdNetwork *)sharedInstance; + +- (void)registerAppForAdNetworkAttribution; + +- (void)updateConversionValue:(NSInteger)conversionValue; + +@end + +NS_ASSUME_NONNULL_END diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.h.meta new file mode 100644 index 00000000..b67338c0 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 82f56fc7ca22f49a78a1caff12e8b67b +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.m new file mode 100644 index 00000000..85e22de6 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.m @@ -0,0 +1,80 @@ +// +// BNCSKAdNetwork.m +// Branch +// +// Created by Ernest Cho on 8/12/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import "BNCSKAdNetwork.h" +#import "BNCApplication.h" + +@interface BNCSKAdNetwork() + +@property (nonatomic, copy, readwrite) NSDate *installDate; + +@property (nonatomic, strong, readwrite) Class skAdNetworkClass; +@property (nonatomic, assign, readwrite) SEL skAdNetworkRegisterAppForAdNetworkAttribution; +@property (nonatomic, assign, readwrite) SEL skAdNetworkUpdateConversionValue; + +@end + +@implementation BNCSKAdNetwork + ++ (BNCSKAdNetwork *)sharedInstance { + static BNCSKAdNetwork *singleton; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + singleton = [[BNCSKAdNetwork alloc] init]; + }); + return singleton; +} + +- (instancetype)init { + self = [super init]; + if (self) { + // by default, we send updates to SKAdNetwork for up to 3 days after install + self.maxTimeSinceInstall = 3600.0 * 24.0 * 3.0; + self.installDate = [BNCApplication currentApplication].currentInstallDate; + + self.skAdNetworkClass = NSClassFromString(@"SKAdNetwork"); + self.skAdNetworkRegisterAppForAdNetworkAttribution = NSSelectorFromString(@"registerAppForAdNetworkAttribution"); + self.skAdNetworkUpdateConversionValue = NSSelectorFromString(@"updateConversionValue:"); + } + return self; +} + +- (BOOL)shouldAttemptSKAdNetworkCallout { + if (self.installDate && self.skAdNetworkClass) { + NSDate *now = [NSDate date]; + NSDate *maxDate = [self.installDate dateByAddingTimeInterval:self.maxTimeSinceInstall]; + if ([now compare:maxDate] == NSOrderedDescending) { + return NO; + } else { + return YES; + } + } + return NO; +} + +- (void)registerAppForAdNetworkAttribution { + if (@available(iOS 14.0, *)) { + if ([self shouldAttemptSKAdNetworkCallout]) { + + // Equivalent call [SKAdNetwork registerAppForAdNetworkAttribution]; + ((id (*)(id, SEL))[self.skAdNetworkClass methodForSelector:self.skAdNetworkRegisterAppForAdNetworkAttribution])(self.skAdNetworkClass, self.skAdNetworkRegisterAppForAdNetworkAttribution); + } + } +} + +- (void)updateConversionValue:(NSInteger)conversionValue { + if (@available(iOS 14.0, *)) { + if ([self shouldAttemptSKAdNetworkCallout]) { + + // Equivalent call [SKAdNetwork updateConversionValue:conversionValue]; + ((id (*)(id, SEL, NSInteger))[self.skAdNetworkClass methodForSelector:self.skAdNetworkUpdateConversionValue])(self.skAdNetworkClass, self.skAdNetworkUpdateConversionValue, conversionValue); + } + } +} + +@end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.m.meta new file mode 100644 index 00000000..a19a281b --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSKAdNetwork.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 0ceaba557923048f78387876404991fa +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.h.meta new file mode 100644 index 00000000..faed8ce6 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: b57ebdf0be4ae4130845e6709057a8ef +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.m new file mode 100644 index 00000000..a59fc1d0 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.m @@ -0,0 +1,553 @@ +// +// BNCServerInterface.m +// Branch-SDK +// +// Created by Alex Austin on 6/6/14. +// Copyright (c) 2014 Branch Metrics. All rights reserved. +// + +#import "BNCServerInterface.h" +#import "BNCConfig.h" +#import "BNCEncodingUtils.h" +#import "NSError+Branch.h" +#import "BranchConstants.h" +#import "BNCDeviceInfo.h" +#import "NSMutableDictionary+Branch.h" +#import "BNCLog.h" +#import "Branch.h" +#import "BNCLocalization.h" +#import "NSString+Branch.h" + +@interface BNCServerInterface () +@property (strong) NSString *requestEndpoint; +@property (strong) id networkService; +@end + +@implementation BNCServerInterface + +- (instancetype) init { + self = [super init]; + if (self) { + self.networkService = [[Branch networkServiceClass] new]; + } + return self; +} + +- (void) dealloc { + [self.networkService cancelAllOperations]; + self.networkService = nil; +} + +#pragma mark - GET methods + +- (void)getRequest:(NSDictionary *)params + url:(NSString *)url + key:(NSString *)key + callback:(BNCServerCallback)callback { + [self getRequest:params url:url key:key retryNumber:0 callback:callback]; +} + +- (void)getRequest:(NSDictionary *)params + url:(NSString *)url + key:(NSString *)key + retryNumber:(NSInteger)retryNumber + callback:(BNCServerCallback)callback { + NSURLRequest *request = [self prepareGetRequest:params url:url key:key retryNumber:retryNumber]; + + [self genericHTTPRequest:request retryNumber:retryNumber callback:callback + retryHandler:^NSURLRequest *(NSInteger lastRetryNumber) { + return [self prepareGetRequest:params url:url key:key retryNumber:lastRetryNumber+1]; + }]; +} + +#pragma mark - POST methods + +- (void)postRequest:(NSDictionary *)post + url:(NSString *)url + key:(NSString *)key + callback:(BNCServerCallback)callback { + [self postRequest:post url:url retryNumber:0 key:key callback:callback]; +} + +- (BOOL)isV2APIURL:(NSString *)urlstring { + return [self isV2APIURL:urlstring baseURL:[self.preferenceHelper branchAPIURL]]; +} + +- (BOOL)isV2APIURL:(NSString *)urlstring baseURL:(NSString *)baseURL { + BOOL found = NO; + if (urlstring && baseURL) { + NSString *matchString = [NSString stringWithFormat:@"%@/v2/", baseURL]; + NSRange range = [urlstring rangeOfString:matchString]; + found = (range.location != NSNotFound); + } + return found; +} + +// workaround for new V1 APIs that expects different format +- (BOOL)isNewV1API:(NSString *)urlstring { + NSArray *newV1Apis = @[ BRANCH_REQUEST_ENDPOINT_CPID, BRANCH_REQUEST_ENDPOINT_LATD ]; + for (NSString *tmp in newV1Apis) { + NSRange range = [urlstring rangeOfString:tmp]; + BOOL found = (range.location != NSNotFound); + if (found) { + return YES; + } + } + return NO; +} + +// SDK-635 Follow up ticket to redesign this. The payload format should be the responsibility of the network request class. +- (NSMutableDictionary *)buildExtendedParametersForURL:(NSString *)url withPostDictionary:(NSDictionary *)post { + NSMutableDictionary *extendedParams = nil; + + // v2 endpoints expect a user data section + if ([self isV2APIURL:url]) { + extendedParams = [NSMutableDictionary new]; + if (post) { + [extendedParams addEntriesFromDictionary:post]; + } + NSDictionary *d = [[BNCDeviceInfo getInstance] v2dictionary]; + if (d.count) { + extendedParams[@"user_data"] = d; + } + + // cpid and latd endpoints expect a v2 format, except with possible customization + } else if ([self isNewV1API:url]) { + extendedParams = [NSMutableDictionary new]; + + NSMutableDictionary *tmp = [NSMutableDictionary dictionaryWithDictionary: [[BNCDeviceInfo getInstance] v2dictionary]]; + if (tmp.count) { + extendedParams[@"user_data"] = tmp; + [tmp addEntriesFromDictionary:post]; + } + + } else { + extendedParams = [self updateDeviceInfoToParams:post]; + } + return extendedParams; +} + +- (void)postRequest:(NSDictionary *)post + url:(NSString *)url + retryNumber:(NSInteger)retryNumber + key:(NSString *)key + callback:(BNCServerCallback)callback { + + NSMutableDictionary *extendedParams = [self buildExtendedParametersForURL:url withPostDictionary:post]; + NSURLRequest *request = [self preparePostRequest:extendedParams url:url key:key retryNumber:retryNumber]; + + // Instrumentation metrics + self.requestEndpoint = [self.preferenceHelper getEndpointFromURL:url]; + + [self genericHTTPRequest:request + retryNumber:retryNumber + callback:callback + retryHandler:^ NSURLRequest *(NSInteger lastRetryNumber) { + return [self preparePostRequest:extendedParams url:url key:key retryNumber:lastRetryNumber+1]; + }]; +} + +- (BNCServerResponse *)postRequestSynchronous:(NSDictionary *)post + url:(NSString *)url + key:(NSString *)key { + NSDictionary *extendedParams = [self updateDeviceInfoToParams:post]; + NSURLRequest *request = [self preparePostRequest:extendedParams url:url key:key retryNumber:0]; + return [self genericHTTPRequestSynchronous:request]; +} + +#pragma mark - Generic requests + +- (void)genericHTTPRequest:(NSURLRequest *)request callback:(BNCServerCallback)callback { + [self genericHTTPRequest:request retryNumber:0 callback:callback + retryHandler:^NSURLRequest *(NSInteger lastRetryNumber) { + return request; + }]; +} + +- (void)genericHTTPRequest:(NSURLRequest *)request + retryNumber:(NSInteger)retryNumber + callback:(BNCServerCallback)callback + retryHandler:(NSURLRequest *(^)(NSInteger))retryHandler { + + void (^completionHandler)(idoperation) = + ^void (idoperation) { + + BNCServerResponse *serverResponse = + [self processServerResponse:operation.response data:operation.responseData error:operation.error]; + [self collectInstrumentationMetricsWithOperation:operation]; + + NSError *underlyingError = operation.error; + NSInteger status = [serverResponse.statusCode integerValue]; + + // If the phone is in a poor network condition, + // iOS will return statuses such as -1001, -1003, -1200, -9806 + // indicating various parts of the HTTP post failed. + // We should retry in those conditions in addition to the case where the server returns a 500 + + // Status 53 means the request was killed by the OS because we're still in the background. + // This started happening in iOS 12 / Xcode 10 production when we're called from continueUserActivity: + // but we're not fully out of the background yet. + + BOOL isRetryableStatusCode = status >= 500 || status < 0 || status == 53; + + // Retry the request if appropriate + if (retryNumber < self.preferenceHelper.retryCount && isRetryableStatusCode) { + dispatch_time_t dispatchTime = + dispatch_time(DISPATCH_TIME_NOW, self.preferenceHelper.retryInterval * NSEC_PER_SEC); + dispatch_after(dispatchTime, dispatch_get_main_queue(), ^{ + if (retryHandler) { + BNCLogDebug(@"Retrying request with url %@", request.URL.relativePath); + // Create the next request + NSURLRequest *retryRequest = retryHandler(retryNumber); + [self genericHTTPRequest:retryRequest + retryNumber:(retryNumber + 1) + callback:callback retryHandler:retryHandler]; + } + }); + + // Do not continue on if retrying, else the callback will be called incorrectly + return; + } + + NSError *branchError = nil; + + // Wrap up bad statuses w/ specific error messages + if (status >= 500) { + branchError = [NSError branchErrorWithCode:BNCServerProblemError error:underlyingError]; + } + else if (status == 409) { + branchError = [NSError branchErrorWithCode:BNCDuplicateResourceError error:underlyingError]; + } + else if (status >= 400) { + NSString *errorString = [serverResponse.data objectForKey:@"error"]; + if (![errorString isKindOfClass:[NSString class]]) + errorString = nil; + if (!errorString) + errorString = underlyingError.localizedDescription; + if (!errorString) + errorString = BNCLocalizedString(@"The request was invalid."); + branchError = [NSError branchErrorWithCode:BNCBadRequestError localizedMessage:errorString]; + } + else if (underlyingError) { + branchError = [NSError branchErrorWithCode:BNCServerProblemError error:underlyingError]; + } + + if (branchError) { + BNCLogError(@"An error prevented request to %@ from completing: %@", + request.URL.absoluteString, branchError); + } + + // Don't call on the main queue since it might be blocked. + if (callback) + callback(serverResponse, branchError); + }; + + if (Branch.trackingDisabled) { + NSString *endpoint = request.URL.absoluteString; + + // if endpoint is not on the whitelist, fail it. + if (![self whiteListContainsEndpoint:endpoint]) { + [[BNCPreferenceHelper preferenceHelper] clearTrackingInformation]; + NSError *error = [NSError branchErrorWithCode:BNCTrackingDisabledError]; + BNCLogError(@"Network service error: %@.", error); + if (callback) { + callback(nil, error); + } + return; + } + } + + id operation = + [self.networkService networkOperationWithURLRequest:request.copy completion:completionHandler]; + [operation start]; + NSError *error = [self verifyNetworkOperation:operation]; + if (error) { + BNCLogError(@"Network service error: %@.", error); + if (callback) { + callback(nil, error); + } + return; + } +} + +- (BOOL)whiteListContainsEndpoint:(NSString *)endpoint { + BNCPreferenceHelper *prefs = [BNCPreferenceHelper preferenceHelper]; + BOOL hasIdentifier = (prefs.linkClickIdentifier.length > 0 ) || (prefs.spotlightIdentifier.length > 0 ) || (prefs.universalLinkUrl.length > 0); + + // Allow install to resolve a link. + if ([endpoint bnc_containsString:@"/v1/install"] && hasIdentifier) { + return YES; + } + + // Allow open to resolve a link. + if ([endpoint bnc_containsString:@"/v1/open"] && hasIdentifier) { + return YES; + } + + // Allow short url creation requests + if ([endpoint bnc_containsString:@"/v1/url"]) { + return YES; + } + + return NO; +} + +- (NSError*) verifyNetworkOperation:(id)operation { + + if (!operation) { + NSString *message = BNCLocalizedString( + @"A network operation instance is expected to be returned by the" + " networkOperationWithURLRequest:completion: method." + ); + NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; + return error; + } + if (![operation conformsToProtocol:@protocol(BNCNetworkOperationProtocol)]) { + NSString *message = + BNCLocalizedFormattedString( + @"Network operation of class '%@' does not conform to the BNCNetworkOperationProtocol.", + NSStringFromClass([operation class])); + NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; + return error; + } + if (!operation.startDate) { + NSString *message = BNCLocalizedString( + @"The network operation start date is not set. The Branch SDK expects the network operation" + " start date to be set by the network provider." + ); + NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; + return error; + } + if (!operation.timeoutDate) { + NSString*message = BNCLocalizedString( + @"The network operation timeout date is not set. The Branch SDK expects the network operation" + " timeout date to be set by the network provider." + ); + NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; + return error; + } + if (!operation.request) { + NSString *message = BNCLocalizedString( + @"The network operation request is not set. The Branch SDK expects the network operation" + " request to be set by the network provider." + ); + NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; + return error; + } + return nil; +} + +- (BNCServerResponse *)genericHTTPRequestSynchronous:(NSURLRequest *)request { + + __block BNCServerResponse *serverResponse = nil; + dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); + + id operation = + [self.networkService + networkOperationWithURLRequest:request.copy + completion:^void (idoperation) { + serverResponse = + [self processServerResponse:operation.response + data:operation.responseData error:operation.error]; + [self collectInstrumentationMetricsWithOperation:operation]; + dispatch_semaphore_signal(semaphore); + }]; + [operation start]; + NSError *error = [self verifyNetworkOperation:operation]; + if (!error) { + dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); + } + return serverResponse; +} + +#pragma mark - Internals + +- (NSURLRequest *)prepareGetRequest:(NSDictionary *)params + url:(NSString *)url + key:(NSString *)key + retryNumber:(NSInteger)retryNumber { + + NSDictionary *preparedParams = + [self prepareParamDict:params key:key retryNumber:retryNumber requestType:@"GET"]; + NSString *requestUrlString = + [NSString stringWithFormat:@"%@%@", url, [BNCEncodingUtils encodeDictionaryToQueryString:preparedParams]]; + BNCLogDebug(@"URL: %@", requestUrlString); + + NSMutableURLRequest *request = + [NSMutableURLRequest requestWithURL:[NSURL URLWithString:requestUrlString] + cachePolicy:NSURLRequestReloadIgnoringLocalCacheData + timeoutInterval:self.preferenceHelper.timeout]; + [request setHTTPMethod:@"GET"]; + [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; + + return request; +} + +- (NSURLRequest *)preparePostRequest:(NSDictionary *)params + url:(NSString *)url + key:(NSString *)key + retryNumber:(NSInteger)retryNumber { + + NSMutableDictionary *preparedParams = + [self prepareParamDict:params key:key retryNumber:retryNumber requestType:@"POST"]; + if ([self isV2APIURL:url]) { + preparedParams[@"sdk"] = nil; + } + if (Branch.trackingDisabled) { + preparedParams[@"tracking_disabled"] = (__bridge NSNumber*) kCFBooleanTrue; + preparedParams[@"local_ip"] = nil; + preparedParams[@"lastest_update_time"] = nil; + preparedParams[@"previous_update_time"] = nil; + preparedParams[@"latest_install_time"] = nil; + preparedParams[@"first_install_time"] = nil; + preparedParams[@"ios_vendor_id"] = nil; + preparedParams[@"hardware_id"] = nil; + preparedParams[@"hardware_id_type"] = nil; + preparedParams[@"is_hardware_id_real"] = nil; + preparedParams[@"device_fingerprint_id"] = nil; + preparedParams[@"identity_id"] = nil; + preparedParams[@"identity"] = nil; + preparedParams[@"update"] = nil; + } + NSData *postData = [BNCEncodingUtils encodeDictionaryToJsonData:preparedParams]; + NSString *postLength = [NSString stringWithFormat:@"%lu", (unsigned long)[postData length]]; + + BNCLogDebug(@"URL: %@.", url); + BNCLogDebug(@"Body: %@\nJSON: %@.", + preparedParams, + [[NSString alloc] initWithData:postData encoding:NSUTF8StringEncoding] + ); + + NSMutableURLRequest *request = + [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url] + cachePolicy:NSURLRequestReloadIgnoringLocalCacheData + timeoutInterval:self.preferenceHelper.timeout]; + [request setHTTPMethod:@"POST"]; + [request setValue:postLength forHTTPHeaderField:@"Content-Length"]; + [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; + [request setHTTPBody:postData]; + + return request; +} + +- (NSMutableDictionary *)prepareParamDict:(NSDictionary *)params + key:(NSString *)key + retryNumber:(NSInteger)retryNumber + requestType:(NSString *)reqType { + + NSMutableDictionary *fullParamDict = [[NSMutableDictionary alloc] init]; + [fullParamDict bnc_safeAddEntriesFromDictionary:params]; + fullParamDict[@"sdk"] = [NSString stringWithFormat:@"ios%@", BNC_SDK_VERSION]; + + // using rangeOfString instead of containsString to support devices running pre iOS 8 + if ([[[NSBundle mainBundle] executablePath] rangeOfString:@".appex/"].location != NSNotFound) { + fullParamDict[@"ios_extension"] = @(1); + } + fullParamDict[@"retryNumber"] = @(retryNumber); + fullParamDict[@"branch_key"] = key; + + NSMutableDictionary *metadata = [[NSMutableDictionary alloc] init]; + [metadata bnc_safeAddEntriesFromDictionary:self.preferenceHelper.requestMetadataDictionary]; + [metadata bnc_safeAddEntriesFromDictionary:fullParamDict[BRANCH_REQUEST_KEY_STATE]]; + if (metadata.count) { + fullParamDict[BRANCH_REQUEST_KEY_STATE] = metadata; + } + // we only send instrumentation info in the POST body request + if (self.preferenceHelper.instrumentationDictionary.count && [reqType isEqualToString:@"POST"]) { + fullParamDict[BRANCH_REQUEST_KEY_INSTRUMENTATION] = self.preferenceHelper.instrumentationDictionary; + } + + return fullParamDict; +} + +- (BNCServerResponse *)processServerResponse:(NSURLResponse *)response + data:(NSData *)data + error:(NSError *)error { + BNCServerResponse *serverResponse = [[BNCServerResponse alloc] init]; + if (!error) { + serverResponse.statusCode = @([(NSHTTPURLResponse *)response statusCode]); + serverResponse.data = [BNCEncodingUtils decodeJsonDataToDictionary:data]; + } + else { + serverResponse.statusCode = @(error.code); + serverResponse.data = error.userInfo; + } + BNCLogDebug(@"Server returned: %@.", serverResponse); + return serverResponse; +} + +- (void) collectInstrumentationMetricsWithOperation:(id)operation { + // multiplying by negative because startTime happened in the past + NSTimeInterval elapsedTime = [operation.startDate timeIntervalSinceNow] * -1000.0; + NSString *lastRoundTripTime = [[NSNumber numberWithDouble:floor(elapsedTime)] stringValue]; + NSString * brttKey = [NSString stringWithFormat:@"%@-brtt", self.requestEndpoint]; + [self.preferenceHelper clearInstrumentationDictionary]; + [self.preferenceHelper addInstrumentationDictionaryKey:brttKey value:lastRoundTripTime]; +} + +- (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict { + BNCDeviceInfo *deviceInfo = [BNCDeviceInfo getInstance]; + @synchronized (deviceInfo) { + [deviceInfo checkAdvertisingIdentifier]; + + // hardware id information. idfa, idfv or random + NSString *hardwareId = [deviceInfo.hardwareId copy]; + NSString *hardwareIdType = [deviceInfo.hardwareIdType copy]; + NSNumber *isRealHardwareId = @(deviceInfo.isRealHardwareId); + if (hardwareId != nil && hardwareIdType != nil && isRealHardwareId != nil) { + dict[BRANCH_REQUEST_KEY_HARDWARE_ID] = hardwareId; + dict[BRANCH_REQUEST_KEY_HARDWARE_ID_TYPE] = hardwareIdType; + dict[BRANCH_REQUEST_KEY_IS_HARDWARE_ID_REAL] = isRealHardwareId; + } + + // idfv is duplicated in the hardware id field when idfa is unavailable + [self safeSetValue:deviceInfo.vendorId forKey:BRANCH_REQUEST_KEY_IOS_VENDOR_ID onDict:dict]; + // idfa is only in the hardware id field + // [self safeSetValue:deviceInfo.advertiserId forKey:@"idfa" onDict:dict]; + + [self safeSetValue:deviceInfo.osName forKey:BRANCH_REQUEST_KEY_OS onDict:dict]; + [self safeSetValue:deviceInfo.osVersion forKey:BRANCH_REQUEST_KEY_OS_VERSION onDict:dict]; + [self safeSetValue:deviceInfo.osBuildVersion forKey:@"build" onDict:dict]; + [self safeSetValue:deviceInfo.extensionType forKey:@"environment" onDict:dict]; + [self safeSetValue:deviceInfo.locale forKey:@"locale" onDict:dict]; + [self safeSetValue:deviceInfo.country forKey:@"country" onDict:dict]; + [self safeSetValue:deviceInfo.language forKey:@"language" onDict:dict]; + [self safeSetValue:deviceInfo.brandName forKey:BRANCH_REQUEST_KEY_BRAND onDict:dict]; + [self safeSetValue:deviceInfo.modelName forKey:BRANCH_REQUEST_KEY_MODEL onDict:dict]; + [self safeSetValue:deviceInfo.cpuType forKey:@"cpu_type" onDict:dict]; + [self safeSetValue:deviceInfo.screenScale forKey:@"screen_dpi" onDict:dict]; + [self safeSetValue:deviceInfo.screenHeight forKey:BRANCH_REQUEST_KEY_SCREEN_HEIGHT onDict:dict]; + [self safeSetValue:deviceInfo.screenWidth forKey:BRANCH_REQUEST_KEY_SCREEN_WIDTH onDict:dict]; + [self safeSetValue:deviceInfo.carrierName forKey:@"device_carrier" onDict:dict]; + + [self safeSetValue:[deviceInfo localIPAddress] forKey:@"local_ip" onDict:dict]; + [self safeSetValue:[deviceInfo connectionType] forKey:@"connection_type" onDict:dict]; + [self safeSetValue:[deviceInfo userAgentString] forKey:@"user_agent" onDict:dict]; + + [self safeSetValue:@(deviceInfo.isAdTrackingEnabled) forKey:BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED onDict:dict]; + + [self safeSetValue:deviceInfo.applicationVersion forKey:@"app_version" onDict:dict]; + [self safeSetValue:deviceInfo.pluginName forKey:@"plugin_name" onDict:dict]; + [self safeSetValue:deviceInfo.pluginVersion forKey:@"plugin_version" onDict:dict]; + + BOOL disableAdNetworkCallouts = self.preferenceHelper.disableAdNetworkCallouts; + if (disableAdNetworkCallouts) { + [dict setObject:[NSNumber numberWithBool:disableAdNetworkCallouts] forKey:@"disable_ad_network_callouts"]; + } + } +} + +- (NSMutableDictionary*)updateDeviceInfoToParams:(NSDictionary *)params { + NSMutableDictionary *extendedParams=[[NSMutableDictionary alloc] init]; + [extendedParams addEntriesFromDictionary:params]; + [self updateDeviceInfoToMutableDictionary:extendedParams]; + return extendedParams; +} + +- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict { + if (value) { + dict[key] = value; + } +} + +@end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.m.meta new file mode 100644 index 00000000..43c4c891 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerInterface.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 9ec6b654e9fe94eee9250bf17948c4ae +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.h.meta new file mode 100644 index 00000000..792b01b3 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 1392389e39de546e285a06c94edb81e3 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.m.meta new file mode 100644 index 00000000..561d3eba --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: c4b75234c0d444b05a8c14efda0b9309 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.h similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.h.meta new file mode 100644 index 00000000..7ab5b4b7 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 482ea79b7eef74bf5808a75e45715a90 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.m similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.m.meta new file mode 100644 index 00000000..47285932 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerRequestQueue.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 4790a6f92588d48c09c0319cf47fb534 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.h.meta new file mode 100644 index 00000000..82c0306e --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 1bca9a4df223945f2a7ab3d133167722 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.m.meta new file mode 100644 index 00000000..c0605179 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCServerResponse.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 072e0a29b2d9240acbe0d30c9e374835 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.h.meta index 4103f765..47bc30cb 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ded789570b0f144a99707ec66e89e28d +guid: 14903c552a36f4bb69e95f8afaa75c18 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.m.meta index 6587a14c..7b71bd05 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSpotlightService.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e8c6fc054bb3b45bf8bb89f60d3f502a +guid: 9246a39f3a38b4a6689daa822a479e70 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.h.meta index 0bb9a673..9bdca3e2 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b99712c0a55af4c97aef818d35dda74a +guid: 7cc17aca482e74277b0d4aaf7d0cdb29 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m old mode 100755 new mode 100644 index 5d2dcce4..6e168198 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m @@ -47,8 +47,14 @@ + (NSString *)getUniqueHardwareId:(BOOL *)isReal } + (NSString*) getAdId { + + // This macro is unnecessary since this code only runs if AdSupport.framework is included + // However, some clients feel more comfortable with no IDFA code at all. + #ifdef BRANCH_EXCLUDE_IDFA_CODE + return nil; + + #else NSString *uid = nil; - Class ASIdentifierManagerClass = NSClassFromString(@"ASIdentifierManager"); if (ASIdentifierManagerClass) { SEL sharedManagerSelector = NSSelectorFromString(@"sharedManager"); @@ -65,8 +71,8 @@ + (NSString*) getAdId { uid = nil; } } - return uid; + #endif } + (NSString *)getVendorId { @@ -75,6 +81,13 @@ + (NSString *)getVendorId { } + (BOOL)adTrackingSafe { + + // This macro is unnecessary since this code only runs if AdSupport.framework is included + // However, some clients feel more comfortable with no IDFA code at all. + #ifdef BRANCH_EXCLUDE_IDFA_CODE + return NO; + + #else Class ASIdentifierManagerClass = NSClassFromString(@"ASIdentifierManager"); if (ASIdentifierManagerClass) { SEL sharedManagerSelector = NSSelectorFromString(@"sharedManager"); @@ -83,7 +96,8 @@ + (BOOL)adTrackingSafe { BOOL enabled = ((BOOL (*)(id, SEL))[sharedManager methodForSelector:advertisingEnabledSelector])(sharedManager, advertisingEnabledSelector); return enabled; } - return YES; + return NO; + #endif } + (NSString *)getDefaultUriScheme { @@ -142,7 +156,11 @@ + (BOOL)isSimulator { } + (NSString *)getOS { + #if TARGET_OS_TV + return @"tv_OS"; + #else return @"iOS"; + #endif } + (NSString *)getOSVersion { diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m.meta index eafa0363..65d5fa87 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCSystemObserver.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 83494244295f04900a95a264cbe70f41 +guid: 8cab18322c3f4449aa2fabdf429525ad PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.h.meta index 6dfade46..c7966069 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 895645e4569ae4214b18a3091e210c83 +guid: 48429df8a79a543a7a171dafa2ebcfbd PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.m.meta index f982e72a..12b67b5d 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTelephony.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: ef3bbdd6088834c1fbd7fbf1377ecc8f +guid: 698f8bd7b61e14ccb9cb0d6032edb449 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.h.meta index bf3eba4f..3799ec74 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c32f3fcd70b84353bbde1751f3f43da +guid: cc443a58babc54d2faf116cf5424d3e8 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,96 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.m.meta index 53912cc9..60868f9c 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCThreads.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2e59dcdd2780346d5a502577c97b727b +guid: 5062413b388934b5bacf4ad975a7ab80 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,27 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -42,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.h.meta index dd8d63a2..791d6761 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 94a523508d62c44f4bfe4ce1278edf3d +guid: 55bb352e09ec3466da8671f118b5e7f2 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.m.meta index d53a8153..89ff0191 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCTuneUtility.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: 5a7af5ab4d5de43f6ba79322f378c27e +guid: ec72d1765bebc463ca7eb39392540b84 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.h.meta index 76cd176e..aac6b0de 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ae9ab16d4d8134a96a6f9eb89009151a +guid: 78e4eef55400149e79980d32803527f7 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,108 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - WebGL: WebGL - second: - enabled: 0 - settings: {} - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.m.meta index de3cb2a7..d4f8acc8 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCURLBlackList.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7ed04407a74549b4bea270513d422a1 +guid: 758cb4affe2814821ac3433c2c212743 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,28 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -43,76 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - WebGL: WebGL - second: - enabled: 0 - settings: {} - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.h.meta index 060f93e0..255930df 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2060db265aef34b039bb2d9723afbcfe +guid: 73face397850945e6a48078c652e1056 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,83 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.m.meta index 8ffe7ebb..937b9cb1 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCUserAgentCollector.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 950d892c62e724f7d8662a77156959d0 +guid: a75793c973fdf44fbbdc7e67f2cc03e3 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,25 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -40,54 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.h.meta index 01205085..34afeb29 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 616deb03b0e1b40cf8babba3524d7272 +guid: 98d4ff4e6074748b9aa40034e8e02962 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,103 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.m.meta index e5617d95..9e2c33b7 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch+Validator.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49f6c89ff6aeb4d038509e62517bd694 +guid: c1c823e58843b4c26a499ba35b8c024c PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,28 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -43,65 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h old mode 100755 new mode 100644 index 010e2a25..b804f778 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h @@ -8,10 +8,8 @@ #if __has_feature(modules) @import Foundation; -@import UIKit; #else #import -#import #endif #import "BNCCallbacks.h" @@ -25,18 +23,24 @@ #import "BNCServerInterface.h" #import "BNCServerRequestQueue.h" #import "BNCAvailability.h" -#import "BranchActivityItemProvider.h" #import "BranchConstants.h" -#import "BranchCSSearchableItemAttributeSet.h" #import "BranchDeepLinkingController.h" #import "BranchEvent.h" #import "BranchLinkProperties.h" #import "BranchDelegate.h" -#import "BranchShareLink.h" #import "BranchUniversalObject.h" #import "BranchCrossPlatformID.h" #import "BranchLastAttributedTouchData.h" +#import "BNCInitSessionResponse.h" #import "UIViewController+Branch.h" +#import "BranchScene.h" + +#if !TARGET_OS_TV +// tvOS does not support these features +#import "BranchShareLink.h" +#import "BranchActivityItemProvider.h" +#import "BranchCSSearchableItemAttributeSet.h" +#endif NS_ASSUME_NONNULL_BEGIN @@ -275,7 +279,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { @property (weak, nullable) NSObject* delegate; #pragma mark - BranchActivityItemProvider methods - +#if !TARGET_OS_TV ///----------------------------------------- /// @name BranchActivityItemProvider methods ///----------------------------------------- @@ -364,7 +368,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ + (BranchActivityItemProvider *)getBranchActivityItemWithParams:(NSDictionary *)params feature:(nullable NSString *)feature stage:(nullable NSString *)stage tags:(nullable NSArray *)tags alias:(nullable NSString *)alias delegate:(nullable id )delegate; - +#endif #pragma mark - Initialization methods @@ -450,6 +454,8 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (void)initSessionWithLaunchOptions:(nullable NSDictionary *)options automaticallyDisplayDeepLinkController:(BOOL)automaticallyDisplayController isReferrable:(BOOL)isReferrable deepLinkHandler:(nullable callbackWithParams)callback; +- (void)initSceneSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)isReferrable explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable automaticallyDisplayController:(BOOL)automaticallyDisplayController + registerDeepLinkHandler:(void (^)(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error))callback; /** Allow Branch to handle a link opening the app, returning whether it was from a Branch link or not. @@ -457,6 +463,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (BOOL)handleDeepLink:(nullable NSURL *)url; +- (BOOL)handleDeepLink:(nullable NSURL *)url sceneIdentifier:(nullable NSString *)sceneIdentifier; /** Have Branch end the current deep link session and start a new session with the provided URL. @@ -476,6 +483,8 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { - (BOOL)continueUserActivity:(nullable NSUserActivity *)userActivity; +- (BOOL)continueUserActivity:(nullable NSUserActivity *)userActivity sceneIdentifier:(nullable NSString *)sceneIdentifier; + /** Call this method from inside your app delegate's `application:openURL:sourceApplication:annotation:` method so that Branch can open the passed URL. This method is for pre-iOS 9 compatibility: If you don't need @@ -495,6 +504,11 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { sourceApplication:(nullable NSString *)sourceApplication annotation:(nullable id)annotation; +- (BOOL)sceneIdentifier:(nullable NSString *)sceneIdentifier + openURL:(nullable NSURL *)url + sourceApplication:(nullable NSString *)sourceApplication + annotation:(nullable id)annotation; + /** Call this method from inside your app delegate's `application:openURL:options:` method so that Branch can open the passed URL. @@ -559,12 +573,18 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { ///-------------------- /** - Have Branch treat this device / session as a debug session, causing more information to be logged, - and info to be available in the debug tab of the dashboard. + Enable debug messages to NSLog. + */ +- (void)enableLogging; + +/** + setDebug is deprecated and all functionality has been disabled. + + If you wish to enable logging, please invoke enableLogging. - @warning This should not be used in production. + If you wish to simulate installs, please see add a Test Device (https://help.branch.io/using-branch/docs/adding-test-devices) then reset your test device's data (https://help.branch.io/using-branch/docs/adding-test-devices#section-resetting-your-test-device-data). */ -- (void)setDebug; +- (void)setDebug __attribute__((deprecated(("setDebug is replaced by enableLogging and test devices. https://help.branch.io/using-branch/docs/adding-test-devices")))); /** @brief Use the `validateSDKIntegration` method as a debugging aid to assure that you've @@ -657,6 +677,13 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (void)ignoreAppleSearchAdsTestData; +/** + Set time window for SKAdNetwork callouts. By default, Branch limits calls to SKAdNetwork to within 72 hours after first install. + + Note: Branch does not automatically call SKAdNetwork unless configured on the dashboard. + */ +- (void)setSKAdNetworkCalloutMaxTimeSinceInstall:(NSTimeInterval)maxTimeInterval; + /** Specify the time to wait in seconds between retries in the case of a Branch server error @@ -678,6 +705,13 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (void)setNetworkTimeout:(NSTimeInterval)timeout; +/** + Disable callouts to ad networks for all events for a user; by default Branch sends callouts to ad networks. + + By calling this method with YES, Branch will not send any events to the ad networks specified in your Branch account. If ad networks are not specified in your Branch account, this method will be ignored and events will still be sent. + */ +- (void)disableAdNetworkCallouts:(BOOL)disableCallouts; + /** Specify that Branch should NOT use an invisible SFSafariViewController to attempt cookie-based matching upon install. If you call this method, we will fall back to using our pool of cookie-IDFA pairs for matching. @@ -700,7 +734,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (void)accountForFacebookSDKPreventingAppLaunch __attribute__((deprecated(("Please ensure application:didFinishLaunchingWithOptions: always returns YES/true instead of using this method. It will be removed in a future release.")))); -- (void)suppressWarningLogs; +- (void)suppressWarningLogs __attribute__((deprecated(("suppressWarningLogs is deprecated and all functionality has been disabled. If you wish to turn off all logging, please invoke BNCLogSetDisplayLevel(BNCLogLevelNone).")))); /** For use by other Branch SDKs @@ -803,6 +837,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Indicates whether or not this user has a custom identity specified for them. Note that this is *independent of installs*. If you call setIdentity, this device will have that identity associated with this user until `logout` is called. This includes persisting through uninstalls, as we track device id. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. */ - (BOOL)isUserIdentified; @@ -844,6 +882,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Loads credit totals from the server. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param callback The callback that is called once the request has completed. */ @@ -852,6 +894,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Redeem credits from the default bucket. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param count The number of credits to redeem. @warning You must `loadRewardsWithCallback:` before calling `redeemRewards`. */ @@ -860,6 +906,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Redeem credits from the default bucket. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param count The number of credits to redeem. @param callback The callback that is called once the request has completed. @warning You must `loadRewardsWithCallback:` before calling `redeemRewards`. @@ -869,6 +919,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Redeem credits from the specified bucket. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param count The number of credits to redeem. @param bucket The bucket to redeem credits from. @warning You must `loadRewardsWithCallback:` before calling `redeemRewards`. @@ -877,7 +931,11 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Redeem credits from the specified bucket. - + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param count The number of credits to redeem. @param bucket The bucket to redeem credits from. @param callback The callback that is called once the request has completed. @@ -903,6 +961,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Loads the last 100 credit transaction history items for the default bucket. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param callback The callback to call with the list of transactions. */ - (void)getCreditHistoryWithCallback:(nullable callbackWithList)callback; @@ -910,6 +972,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Loads the last 100 credit transaction history items for the specified bucket. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param bucket The bucket to get transaction history for. @param callback The callback to call with the list of transactions. */ @@ -918,6 +984,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Loads the last n credit transaction history items after the specified transaction ID for the default. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param creditTransactionId The ID of the transaction to start from. @param length The number of transactions to pull. @param order The direction to order transactions in the callback list. Least recent first means oldest items will be in the front of the response array, most recent means newest items will be front. @@ -928,6 +998,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Loads the last n credit transaction history items after the specified transaction ID for the specified bucket. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param bucket The bucket to get transaction history for. @param creditTransactionId The ID of the transaction to start from. @param length The number of transactions to pull. @@ -945,6 +1019,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Send a user action to the server. Some examples actions could be things like `viewed_personal_welcome`, `purchased_an_item`, etc. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param action The action string. */ - (void)userCompletedAction:(nullable NSString *)action; @@ -952,6 +1030,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Send a user action to the server with additional state items. Some examples actions could be things like `viewed_personal_welcome`, `purchased_an_item`, etc. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param action The action string. @param state The additional state items associated with the action. */ @@ -960,6 +1042,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Send a user action to the server with additional state items. Some examples actions could be things like `viewed_personal_welcome`, `purchased_an_item`, etc. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param action The action string. @param state The additional state items associated with the action. @param branchViewCallback Callback for Branch view state. @@ -975,6 +1061,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { makes an in-app purchase, or buys a subscription. The commerce events are tracked in the Branch dashboard along with your other events so you can judge the effectiveness of campaigns and other analytics. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param commerceEvent The BNCCommerceEvent that describes the purchase. @param metadata Optional metadata you may want add to the event. @@ -992,6 +1082,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Branch includes SDK methods to allow retrieval of our Cross Platform ID (CPID) from the client. This results in an asynchronous call being made to Branch’s servers with CPID data returned when possible. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param completion callback with cross platform id data */ - (void)crossPlatformIdDataWithCompletion:(void(^) (BranchCrossPlatformID * _Nullable cpid))completion; @@ -1000,7 +1094,11 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { Branch includes SDK methods to allow retrieval of our last attributed touch data (LATD) from the client. This results in an asynchronous call being made to Branch's servers with LATD data returned when possible. Last attributed touch data contains the information associated with that user's last viewed impression or clicked link. - @param window attribution window in days. If the window is outside the server supported range, it will default to 30 days. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + + @param window attribution window in days. If the window is 0, the server will use the server side default. If the window is outside the server supported range, it will default to 30 days. @param completion callback with attribution data */ - (void)lastAttributedTouchDataWithAttributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData * _Nullable latd))completion; @@ -1271,6 +1369,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url without any items specified. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param callback Callback called with the url. */ @@ -1278,6 +1380,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param callback Callback called with the url. @@ -1286,6 +1392,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, channel, and feature. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1296,6 +1406,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, channel, feature, and stage. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1307,6 +1421,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, channel, feature, stage, and alias. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1320,6 +1438,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, channel, feature, stage, and link type. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1332,6 +1454,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, channel, feature, stage, and match duration. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1344,6 +1470,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, tags, channel, feature, and stage. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param tags An array of tags to associate with this link, useful for tracking. @@ -1356,6 +1486,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, tags, channel, feature, stage, and alias. The usage type will default to unlimited. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1370,6 +1504,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, tags, channel, feature, stage, and link type. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @@ -1384,6 +1522,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, tags, channel, feature, stage, and match duration. The usage type will default to unlimited. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @param tags An array of tags to associate with this link, useful for tracking. @@ -1397,6 +1539,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, tags, channel, feature, stage, and match duration. The usage type will default to unlimited. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @param tags An array of tags to associate with this link, useful for tracking. @@ -1412,6 +1558,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Get a short url with the specified params, tags, channel, feature, stage, campaign and match duration. The usage type will default to unlimited. + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + @param params Dictionary of parameters to include in the link. @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared. @param tags An array of tags to associate with this link, useful for tracking. @@ -1425,9 +1575,17 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (void)getShortUrlWithParams:(nullable NSDictionary *)params andTags:(nullable NSArray *)tags andAlias:(nullable NSString *)alias andMatchDuration:(NSUInteger)duration andChannel:(nullable NSString *)channel andFeature:(nullable NSString *)feature andStage:(nullable NSString *)stage andCampaign:(nullable NSString *)campaign andCallback:(nullable callbackWithUrl)callback; +/** + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + + */ - (void)getSpotlightUrlWithParams:(NSDictionary *)params callback:(callbackWithParams)callback; #pragma mark - Content Discovery methods +#if !TARGET_OS_TV ///-------------------------------- /// @name Content Discovery methods @@ -1681,6 +1839,8 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (void)removeAllPrivateContentFromSpotLightWithCallback:(void (^_Nullable)(NSError * _Nullable error))completion; +#endif + /** Method for creating a one of Branch instance and specifying its dependencies. @@ -1690,6 +1850,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { /** Method used by BranchUniversalObject to register a view on content + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. @warning This is meant for use internally only and should not be used by apps. */ @@ -1703,7 +1867,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { This is the block that is called each time a new Branch session is started. It is automatically set when Branch is initialized with `initSessionWithLaunchOptions:andRegisterDeepLinkHandler`. */ -@property (copy, nonatomic) void(^ sessionInitWithParamsCallback) (NSDictionary * _Nullable params, NSError * _Nullable error); +@property (copy, nonatomic) void(^ sessionInitWithParamsCallback) (NSDictionary * _Nullable params, NSError * _Nullable error) DEPRECATED_ATTRIBUTE; /** This is the block that is called each time a new Branch session is started. It is automatically set @@ -1712,7 +1876,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { The difference with this callback from `sessionInitWithParamsCallback` is that it is called with a BranchUniversalObject. */ -@property (copy, nonatomic) void (^ sessionInitWithBranchUniversalObjectCallback) (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error); +@property (copy, nonatomic) void (^ sessionInitWithBranchUniversalObjectCallback) (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error) DEPRECATED_ATTRIBUTE; // Read-only property exposed for unit testing. @property (strong, readonly) BNCServerInterface* serverInterface; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h.meta index 030d029c..71d93e99 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4cdaad16b99bd4155a07f03e3014961c +guid: c173ffaf4b9f54f30a0ae696005be9aa PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.m old mode 100755 new mode 100644 index 69d80db9..7240dd82 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Branch.m @@ -7,7 +7,6 @@ // #import "Branch.h" -#import "BNCContentDiscoveryManager.h" #import "BNCCrashlyticsWrapper.h" #import "BNCDeepLinkViewControllerInstance.h" #import "BNCEncodingUtils.h" @@ -36,13 +35,19 @@ #import "NSMutableDictionary+Branch.h" #import "NSString+Branch.h" #import "Branch+Validator.h" -#import "BNCSpotlightService.h" #import "BNCApplication.h" #import "BNCURLBlackList.h" -#import "BNCUserAgentCollector.h" -#import "BNCAppleSearchAds.h" #import "BNCFacebookAppLinks.h" #import "BNCDeviceInfo.h" +#import "BNCCallbackMap.h" +#import "BNCSKAdNetwork.h" + +#if !TARGET_OS_TV +#import "BNCUserAgentCollector.h" +#import "BNCAppleSearchAds.h" +#import "BNCSpotlightService.h" +#import "BNCContentDiscoveryManager.h" +#endif NSString * const BRANCH_FEATURE_TAG_SHARE = @"share"; NSString * const BRANCH_FEATURE_TAG_REFERRAL = @"referral"; @@ -129,13 +134,18 @@ @interface Branch() { @property (assign, nonatomic) BOOL shouldAutomaticallyDeepLink; @property (strong, nonatomic) BNCLinkCache *linkCache; @property (strong, nonatomic) BNCPreferenceHelper *preferenceHelper; -@property (strong, nonatomic) BNCContentDiscoveryManager *contentDiscoveryManager; @property (strong, nonatomic) NSMutableDictionary *deepLinkControllers; @property (weak, nonatomic) UIViewController *deepLinkPresentingController; @property (strong, nonatomic) NSDictionary *deepLinkDebugParams; @property (strong, nonatomic) NSMutableArray *whiteListedSchemeList; @property (strong, nonatomic) BNCURLBlackList *URLBlackList; +#if !TARGET_OS_TV +@property (strong, nonatomic) BNCContentDiscoveryManager *contentDiscoveryManager; +#endif + +@property (nonatomic, copy, nullable) void (^sceneSessionInitWithCallback)(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error); + @end @implementation Branch @@ -226,24 +236,28 @@ - (id)initWithInterface:(BNCServerInterface *)interface self = [super init]; if (!self) return self; - + // Initialize instance variables self.isolationQueue = dispatch_queue_create([@"branchIsolationQueue" UTF8String], DISPATCH_QUEUE_SERIAL); - + _serverInterface = interface; _serverInterface.preferenceHelper = preferenceHelper; _requestQueue = queue; _linkCache = cache; _preferenceHelper = preferenceHelper; - _contentDiscoveryManager = [[BNCContentDiscoveryManager alloc] init]; _initializationStatus = BNCInitStatusUninitialized; _processing_sema = dispatch_semaphore_create(1); _networkCount = 0; _deepLinkControllers = [[NSMutableDictionary alloc] init]; _whiteListedSchemeList = [[NSMutableArray alloc] init]; + + #if !TARGET_OS_TV + _contentDiscoveryManager = [[BNCContentDiscoveryManager alloc] init]; + #endif + self.class.branchKey = key; self.URLBlackList = [BNCURLBlackList new]; - + [BranchOpenRequest setWaitNeededForOpenResponseLock]; // Register for notifications @@ -263,7 +277,7 @@ - (id)initWithInterface:(BNCServerInterface *)interface // queue up async data loading [self loadApplicationData]; [self loadUserAgent]; - + return self; } @@ -294,6 +308,7 @@ + (Class)networkServiceClass { } #pragma mark - BrachActivityItemProvider methods +#if !TARGET_OS_TV + (BranchActivityItemProvider *)getBranchActivityItemWithParams:(NSDictionary *)params { return [[BranchActivityItemProvider alloc] initWithParams:params tags:nil feature:nil stage:nil campaign:nil alias:nil delegate:nil]; @@ -323,6 +338,7 @@ + (BranchActivityItemProvider *)getBranchActivityItemWithParams:(NSDictionary *) return [[BranchActivityItemProvider alloc] initWithParams:params tags:tags feature:feature stage:stage campaign:nil alias:alias delegate:delegate]; } +#endif #pragma mark - Configuration methods @@ -353,7 +369,7 @@ + (BOOL)useTestBranchKey { + (void)setBranchKey:(NSString *)branchKey { NSError *error; [self setBranchKey:branchKey error:&error]; - + if (error) { BNCLogError(@"Branch init error: %@", error.localizedDescription); } @@ -367,15 +383,15 @@ + (void)setBranchKey:(NSString*)branchKey error:(NSError **)error { [branchKey isEqualToString:bnc_branchKey]) { return; } - + NSString *errorMessage = [NSString stringWithFormat:@"Branch key can only be set once."]; *error = [NSError branchErrorWithCode:BNCInitError localizedMessage:errorMessage]; return; } - + if (![branchKey isKindOfClass:[NSString class]]) { NSString *typeName = (branchKey) ? NSStringFromClass(branchKey.class) : @""; - + NSString *errorMessage = [NSString stringWithFormat:@"Invalid Branch key of type '%@'.", typeName]; *error = [NSError branchErrorWithCode:BNCInitError localizedMessage:errorMessage]; return; @@ -387,10 +403,10 @@ + (void)setBranchKey:(NSString*)branchKey error:(NSError **)error { @"You are using your test app's Branch Key. " "Remember to change it to live Branch Key for production deployment." ); - + } else if ([branchKey hasPrefix:@"key_live"]) { bnc_useTestBranchKey = NO; - + } else { NSString *errorMessage = [NSString stringWithFormat:@"Invalid Branch key format. Did you add your Branch key to your Info.plist? Passed key is '%@'.", branchKey]; *error = [NSError branchErrorWithCode:BNCInitError localizedMessage:errorMessage]; @@ -404,7 +420,7 @@ + (void)setBranchKey:(NSString*)branchKey error:(NSError **)error { + (NSString *)branchKey { @synchronized (self) { if (bnc_branchKey) return bnc_branchKey; - + NSDictionary *branchDictionary = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"branch_key"]; NSString *branchKey = nil; if ([branchDictionary isKindOfClass:[NSString class]]) { @@ -443,11 +459,17 @@ + (BOOL)enableFingerprintIDInCrashlyticsReports { } } +- (void)enableLogging { + BNCLogSetDisplayLevel(BNCLogLevelDebug); +} + - (void)setDebug { - self.preferenceHelper.isDebug = YES; - if (BNCLogDisplayLevel() > BNCLogLevelDebug) { - BNCLogSetDisplayLevel(BNCLogLevelDebug); - } + NSLog(@"Branch setDebug is deprecated and all functionality has been disabled. " + "If you wish to enable logging, please invoke enableLogging. " + "If you wish to simulate installs, please see add a Test Device " + "(https://help.branch.io/using-branch/docs/adding-test-devices) " + "then reset your test device's data " + "(https://help.branch.io/using-branch/docs/adding-test-devices#section-resetting-your-test-device-data)."); } - (void)validateSDKIntegration { @@ -464,6 +486,10 @@ - (BOOL)isUserIdentified { return self.preferenceHelper.userIdentity != nil; } +- (void)disableAdNetworkCallouts:(BOOL)disableCallouts { + self.preferenceHelper.disableAdNetworkCallouts = disableCallouts; +} + - (void)setNetworkTimeout:(NSTimeInterval)timeout { self.preferenceHelper.timeout = timeout; } @@ -485,7 +511,8 @@ - (void)accountForFacebookSDKPreventingAppLaunch { } - (void)suppressWarningLogs { - BNCLogSetDisplayLevel(BNCLogLevelError); + NSLog(@"suppressWarningLogs is deprecated and all functionality has been disabled. " + "If you wish to turn off all logging, please invoke BNCLogSetDisplayLevel(BNCLogLevelNone)."); } - (void)setRequestMetadataKey:(NSString *)key value:(NSObject *)value { @@ -537,7 +564,7 @@ + (void)setTrackingDisabled:(BOOL)disabled { // Set the flag: [BNCPreferenceHelper preferenceHelper].trackingDisabled = NO; // Initialize a Branch session: - [Branch.getInstance initUserSessionAndCallCallback:NO]; + [Branch.getInstance initUserSessionAndCallCallback:NO sceneIdentifier:nil]; } } } @@ -584,35 +611,58 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options automaticallyDispla [self initSessionWithLaunchOptions:options isReferrable:isReferrable explicitlyRequestedReferrable:YES automaticallyDisplayController:automaticallyDisplayController registerDeepLinkHandler:callback]; } - #pragma mark - Actual Init Session - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)isReferrable explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable automaticallyDisplayController:(BOOL)automaticallyDisplayController registerDeepLinkHandlerUsingBranchUniversalObject:(callbackWithBranchUniversalObject)callback { - self.sessionInitWithBranchUniversalObjectCallback = callback; - [self initSessionWithLaunchOptions:options isReferrable:isReferrable explicitlyRequestedReferrable:explicitlyRequestedReferrable automaticallyDisplayController:automaticallyDisplayController]; + + [self initSceneSessionWithLaunchOptions:options isReferrable:isReferrable explicitlyRequestedReferrable:explicitlyRequestedReferrable automaticallyDisplayController:automaticallyDisplayController + registerDeepLinkHandler:^(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error) { + if (callback) { + if (initResponse) { + callback(initResponse.universalObject, initResponse.linkProperties, error); + } else { + callback([BranchUniversalObject new], [BranchLinkProperties new], error); + } + } + }]; } - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)isReferrable explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable automaticallyDisplayController:(BOOL)automaticallyDisplayController registerDeepLinkHandler:(callbackWithParams)callback { - self.sessionInitWithParamsCallback = callback; - [self initSessionWithLaunchOptions:options isReferrable:isReferrable explicitlyRequestedReferrable:explicitlyRequestedReferrable automaticallyDisplayController:automaticallyDisplayController]; + + [self initSceneSessionWithLaunchOptions:options isReferrable:isReferrable explicitlyRequestedReferrable:explicitlyRequestedReferrable automaticallyDisplayController:automaticallyDisplayController + registerDeepLinkHandler:^(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error) { + if (callback) { + if (initResponse) { + callback(initResponse.params, error); + } else { + callback([NSDictionary new], error); + } + } + }]; } +- (void)initSceneSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)isReferrable explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable automaticallyDisplayController:(BOOL)automaticallyDisplayController + registerDeepLinkHandler:(void (^)(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error))callback { + self.sceneSessionInitWithCallback = callback; + [self initSessionWithLaunchOptions:options isReferrable:isReferrable explicitlyRequestedReferrable:explicitlyRequestedReferrable automaticallyDisplayController:automaticallyDisplayController]; +} - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)isReferrable explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable automaticallyDisplayController:(BOOL)automaticallyDisplayController { - + [self.class addBranchSDKVersionToCrashlyticsReport]; self.shouldAutomaticallyDeepLink = automaticallyDisplayController; // If the SDK is already initialized, this means that initSession was called after other lifecycle calls. if (self.initializationStatus == BNCInitStatusInitialized) { - [self initUserSessionAndCallCallback:YES]; + [self initUserSessionAndCallCallback:YES sceneIdentifier:nil]; return; } // Save data from push notification on app launch + #if !TARGET_OS_TV if ([options objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey]) { id branchUrlFromPush = [options objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey][BRANCH_PUSH_NOTIFICATION_PAYLOAD_KEY]; if ([branchUrlFromPush isKindOfClass:[NSString class]]) { @@ -620,10 +670,11 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options self.preferenceHelper.referringURL = branchUrlFromPush; } } - + #endif + // Handle case where there's no URI scheme or Universal Link. if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey] && ![options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) { - + // queue up async attribution checks [self checkFacebookAppLinks]; [self checkAppleSearchAdsAttribution]; @@ -634,9 +685,9 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options - (void)checkAttributionStatusAndInitialize { dispatch_async(self.isolationQueue, ^(){ if ([BNCPreferenceHelper preferenceHelper].faceBookAppLink) { - [self handleDeepLink:[BNCPreferenceHelper preferenceHelper].faceBookAppLink]; + [self handleDeepLink:[BNCPreferenceHelper preferenceHelper].faceBookAppLink sceneIdentifier:nil]; } else { - [self initUserSessionAndCallCallback:YES]; + [self initUserSessionAndCallCallback:YES sceneIdentifier:nil]; } }); } @@ -669,15 +720,19 @@ - (void)setBlackListURLRegex:(NSArray*)blackListURLs { // This is currently the same as handleDeeplink - (BOOL)handleDeepLinkWithNewSession:(NSURL *)url { - return [self handleDeepLink:url]; + return [self handleDeepLink:url sceneIdentifier:nil]; } - (BOOL)handleDeepLink:(NSURL *)url { - + return [self handleDeepLink:url sceneIdentifier:nil]; +} + +- (BOOL)handleDeepLink:(NSURL *)url sceneIdentifier:(NSString *)sceneIdentifier { + // we've been resetting the session on all deeplinks for quite some time // this allows foreground links to callback self.initializationStatus = BNCInitStatusUninitialized; - + NSString *blackListPattern = nil; blackListPattern = [self.URLBlackList blackListPatternMatchingURL:url]; if (!blackListPattern) { @@ -687,20 +742,20 @@ - (BOOL)handleDeepLink:(NSURL *)url { self.preferenceHelper.blacklistURLOpen = YES; self.preferenceHelper.externalIntentURI = blackListPattern; self.preferenceHelper.referringURL = blackListPattern; - - [self initUserSessionAndCallCallback:YES]; + + [self initUserSessionAndCallCallback:YES sceneIdentifier:sceneIdentifier]; return NO; } NSString *scheme = [url scheme]; if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) { - return [self handleUniversalDeepLink_private:url.absoluteString]; + return [self handleUniversalDeepLink_private:url.absoluteString sceneIdentifier:sceneIdentifier]; } else { - return [self handleSchemeDeepLink_private:url]; + return [self handleSchemeDeepLink_private:url sceneIdentifier:sceneIdentifier]; } } -- (BOOL)handleSchemeDeepLink_private:(NSURL*)url { +- (BOOL)handleSchemeDeepLink_private:(NSURL*)url sceneIdentifier:(NSString *)sceneIdentifier { BOOL handled = NO; self.preferenceHelper.referringURL = nil; if (url && ![url isEqual:[NSNull null]]) { @@ -732,7 +787,7 @@ - (BOOL)handleSchemeDeepLink_private:(NSURL*)url { self.preferenceHelper.linkClickIdentifier = params[@"link_click_id"]; } } - [self initUserSessionAndCallCallback:YES]; + [self initUserSessionAndCallCallback:YES sceneIdentifier:sceneIdentifier]; return handled; } @@ -741,7 +796,14 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation { - return [self handleDeepLink:url]; + return [self handleDeepLink:url sceneIdentifier:nil]; +} + +- (BOOL)sceneIdentifier:(NSString *)sceneIdentifier + openURL:(NSURL *)url + sourceApplication:(NSString *)sourceApplication + annotation:(id)annotation { + return [self handleDeepLink:url sceneIdentifier:sceneIdentifier]; } - (BOOL)application:(UIApplication *)application @@ -761,13 +823,13 @@ - (BOOL)application:(UIApplication *)application return [self application:application openURL:url sourceApplication:source annotation:annotation]; } -- (BOOL)handleUniversalDeepLink_private:(NSString*)urlString { +- (BOOL)handleUniversalDeepLink_private:(NSString*)urlString sceneIdentifier:(NSString *)sceneIdentifier { if (urlString.length) { self.preferenceHelper.universalLinkUrl = urlString; self.preferenceHelper.referringURL = urlString; } - [self initUserSessionAndCallCallback:YES]; + [self initUserSessionAndCallCallback:YES sceneIdentifier:sceneIdentifier]; id branchUniversalLinkDomains = [self.preferenceHelper getBranchUniversalLinkDomains]; if ([branchUniversalLinkDomains isKindOfClass:[NSString class]] && [urlString bnc_containsString:branchUniversalLinkDomains]) { @@ -792,21 +854,28 @@ - (BOOL)handleUniversalDeepLink_private:(NSString*)urlString { } - (BOOL)continueUserActivity:(NSUserActivity *)userActivity { + return [self continueUserActivity:userActivity sceneIdentifier:nil]; +} + +- (BOOL)continueUserActivity:(NSUserActivity *)userActivity sceneIdentifier:(NSString *)sceneIdentifier { BNCLogDebugSDK(@"continueUserActivity:"); // Check to see if a browser activity needs to be handled if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) { - return [self handleDeepLink:userActivity.webpageURL]; + return [self handleDeepLink:userActivity.webpageURL sceneIdentifier:sceneIdentifier]; } + NSString *spotlightIdentifier = nil; + + #if !TARGET_OS_TV // Check to see if a spotlight activity needs to be handled - NSString *spotlightIdentifier = [self.contentDiscoveryManager spotlightIdentifierFromActivity:userActivity]; + spotlightIdentifier = [self.contentDiscoveryManager spotlightIdentifierFromActivity:userActivity]; NSURL *webURL = userActivity.webpageURL; if ([self isBranchLink:userActivity.userInfo[CSSearchableItemActivityIdentifier]]) { - return [self handleDeepLink:[NSURL URLWithString:userActivity.userInfo[CSSearchableItemActivityIdentifier]]]; + return [self handleDeepLink:[NSURL URLWithString:userActivity.userInfo[CSSearchableItemActivityIdentifier]] sceneIdentifier:sceneIdentifier]; } else if (webURL != nil && [self isBranchLink:[webURL absoluteString]]) { - return [self handleDeepLink:webURL]; + return [self handleDeepLink:webURL sceneIdentifier:sceneIdentifier]; } else if (spotlightIdentifier) { self.preferenceHelper.spotlightIdentifier = spotlightIdentifier; } else { @@ -815,8 +884,9 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity { self.preferenceHelper.spotlightIdentifier = nonBranchSpotlightIdentifier; } } + #endif - [self initUserSessionAndCallCallback:YES]; + [self initUserSessionAndCallCallback:YES sceneIdentifier:sceneIdentifier]; return spotlightIdentifier != nil; } @@ -862,7 +932,7 @@ - (void)handlePushNotification:(NSDictionary *)userInfo { if (urlStr && [[UIApplicationClass sharedApplication] applicationState] == UIApplicationStateActive) { NSURL *url = [NSURL URLWithString:urlStr]; if (url) { - [self handleDeepLink:url]; + [self handleDeepLink:url sceneIdentifier:nil]; } } } @@ -870,6 +940,7 @@ - (void)handlePushNotification:(NSDictionary *)userInfo { #pragma mark - async data collection - (void)loadUserAgent { + #if !TARGET_OS_TV dispatch_async(self.isolationQueue, ^(){ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); [[BNCUserAgentCollector instance] loadUserAgentWithCompletion:^(NSString * _Nullable userAgent) { @@ -877,6 +948,7 @@ - (void)loadUserAgent { }]; dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); }); + #endif } - (void)loadApplicationData { @@ -892,22 +964,29 @@ - (void)loadApplicationData { #pragma mark - Apple Search Ad Check - (void)delayInitToCheckForSearchAds { + #if !TARGET_OS_TV [BNCAppleSearchAds sharedInstance].enableAppleSearchAdsCheck = YES; + #endif } - (void)useLongerWaitForAppleSearchAds { + #if !TARGET_OS_TV [[BNCAppleSearchAds sharedInstance] useLongWaitAppleSearchAdsConfig]; + #endif } - (void)ignoreAppleSearchAdsTestData { + #if !TARGET_OS_TV [BNCAppleSearchAds sharedInstance].ignoreAppleTestData = YES; + #endif } - (void)checkAppleSearchAdsAttribution { + #if !TARGET_OS_TV if (![BNCAppleSearchAds sharedInstance].enableAppleSearchAdsCheck) { return; } - + dispatch_async(self.isolationQueue, ^(){ dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); [[BNCAppleSearchAds sharedInstance] checkAppleSearchAdsSaveTo:[BNCPreferenceHelper preferenceHelper] installDate:[BNCApplication currentApplication].currentInstallDate completion:^{ @@ -915,6 +994,11 @@ - (void)checkAppleSearchAdsAttribution { }]; dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); }); + #endif +} + +- (void)setSKAdNetworkCalloutMaxTimeSinceInstall:(NSTimeInterval)maxTimeInterval { + [BNCSKAdNetwork sharedInstance].maxTimeSinceInstall = maxTimeInterval; } #pragma mark - Pre-initialization support @@ -972,7 +1056,7 @@ - (void)setIdentity:(NSString *)userId withCallback:(callbackWithParams)callback } return; } - + [self initSafetyCheck]; dispatch_async(self.isolationQueue, ^(){ BranchSetIdentityRequest *req = [[BranchSetIdentityRequest alloc] initWithUserId:userId callback:callback]; @@ -1031,7 +1115,7 @@ - (void)userCompletedAction:(NSString *)action withState:(NSDictionary *)state { if (!action) { return; } - + [self initSafetyCheck]; dispatch_async(self.isolationQueue, ^(){ BranchUserCompletedActionRequest *req = [[BranchUserCompletedActionRequest alloc] initWithAction:action state:state]; @@ -1375,6 +1459,7 @@ - (NSString *)getLongURLWithParams:(NSDictionary *)params andFeature:(NSString * } #pragma mark - Discoverable content methods +#if !TARGET_OS_TV - (void)createDiscoverableContentWithTitle:(NSString *)title description:(NSString *)description { [self.contentDiscoveryManager indexContentWithTitle:title description:description]; @@ -1518,6 +1603,7 @@ - (void)removeAllPrivateContentFromSpotLightWithCallback:(void (^)(NSError * err completion(error); }]; } +#endif #pragma mark - Private methods @@ -1575,7 +1661,7 @@ - (void)generateShortUrl:(NSArray *)tags andStage:(NSString *)stage andCampaign:campaign andParams:(NSDictionary *)params andCallback:(callbackWithUrl)callback { - + [self initSafetyCheck]; dispatch_async(self.isolationQueue, ^(){ BNCLinkData *linkData = [self prepareLinkDataFor:tags @@ -1591,7 +1677,10 @@ - (void)generateShortUrl:(NSArray *)tags if ([self.linkCache objectForKey:linkData]) { if (callback) { - callback([self.linkCache objectForKey:linkData], nil); + // callback on main, this is generally what the client expects and maintains our previous behavior + dispatch_async(dispatch_get_main_queue(), ^ { + callback([self.linkCache objectForKey:linkData], nil); + }); } return; } @@ -1774,7 +1863,12 @@ - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithP BranchUniversalObject *buo = [[BranchUniversalObject alloc] init]; buo.contentMetadata.customMetadata = (id) params; [[BranchEvent standardEvent:BranchStandardEventViewItem withContentItem:buo] logEvent]; - if (callback) callback(@{}, nil); + if (callback) { + // callback on main, this is generally what the client expects and maintains our previous behavior + dispatch_async(dispatch_get_main_queue(), ^ { + callback(@{}, nil); + }); + } }); } @@ -1784,7 +1878,7 @@ - (void)applicationDidBecomeActive { if (!Branch.trackingDisabled && self.initializationStatus != BNCInitStatusInitialized && ![self.requestQueue containsInstallOrOpen]) { - [self initUserSessionAndCallCallback:YES]; + [self initUserSessionAndCallCallback:YES sceneIdentifier:nil]; } } @@ -1802,7 +1896,7 @@ - (void)applicationWillResignActive { - (void)callClose { if (self.initializationStatus != BNCInitStatusUninitialized) { self.initializationStatus = BNCInitStatusUninitialized; - + BranchContentDiscoverer *contentDiscoverer = [BranchContentDiscoverer getInstance]; if (contentDiscoverer) [contentDiscoverer stopDiscoveryTask]; @@ -1861,7 +1955,12 @@ - (void) processRequest:(BNCServerRequest*)req error.code == BNCBadRequestError || error.code == BNCDuplicateResourceError) { - BNCPerformBlockOnMainThreadSync(^{ [req processResponse:response error:error]; }); + BNCPerformBlockOnMainThreadSync(^{ + [req processResponse:response error:error]; + if ([req isKindOfClass:[BranchEventRequest class]]) { + [[BNCCallbackMap shared] callCompletionForRequest:req withSuccessStatus:(error == nil) error:error]; + } + }); [self.requestQueue dequeue]; self.networkCount = 0; @@ -1883,16 +1982,8 @@ - (void) processRequest:(BNCServerRequest*)req // Next, remove all the requests that should not be replayed. Note, we do this before // calling callbacks, in case any of the callbacks try to kick off another request, which // could potentially start another request (and call these callbacks again) - - NSSet *replayableRequests = [[NSSet alloc] initWithArray:@[ - BranchEventRequest.class, - BranchUserCompletedActionRequest.class, - BranchSetIdentityRequest.class, - BranchCommerceEventRequest.class, - ]]; - for (BNCServerRequest *request in requestsToFail) { - if (Branch.trackingDisabled || ![replayableRequests containsObject:request.class]) { + if (Branch.trackingDisabled || ![self isReplayableRequest:request]) { [self.requestQueue remove:request]; } } @@ -1902,9 +1993,40 @@ - (void) processRequest:(BNCServerRequest*)req // Finally, call all the requests callbacks with the error for (BNCServerRequest *request in requestsToFail) { - BNCPerformBlockOnMainThreadSync(^ { [request processResponse:nil error:error]; }); + BNCPerformBlockOnMainThreadSync(^ { + [request processResponse:nil error:error]; + + // BranchEventRequests can have callbacks directly tied to them. + if ([request isKindOfClass:[BranchEventRequest class]]) { + NSError *error = [NSError branchErrorWithCode:BNCGeneralError localizedMessage:@"Cancelling queued network requests due to a previous network error."]; + [[BNCCallbackMap shared] callCompletionForRequest:req withSuccessStatus:NO error:error]; + } + }); + } + } +} + +- (BOOL)isReplayableRequest:(BNCServerRequest *)request { + + // These request types + NSSet *replayableRequests = [[NSSet alloc] initWithArray:@[ + BranchEventRequest.class, + BranchUserCompletedActionRequest.class, + BranchSetIdentityRequest.class, + BranchCommerceEventRequest.class, + ]]; + + if ([replayableRequests containsObject:request.class]) { + + // Check if the client registered a callback for this request. + // This indicates the client will handle retry themselves, so fail it. + if ([[BNCCallbackMap shared] containsRequest:request]) { + return NO; + } else { + return YES; } } + return NO; } - (void)processNextQueueItem { @@ -1925,7 +2047,7 @@ - (void)processNextQueueItem { [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]]; }); return; - + } else if (![req isKindOfClass:[BranchOpenRequest class]] && (!self.preferenceHelper.deviceFingerprintID || !self.preferenceHelper.sessionID)) { BNCLogError(@"Missing session items!"); @@ -1933,7 +2055,7 @@ - (void)processNextQueueItem { [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]]; }); return; - + } dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); @@ -1965,11 +2087,11 @@ - (void)clearNetworkQueue { - (void)initSafetyCheck { if (self.initializationStatus == BNCInitStatusUninitialized) { BNCLogDebug(@"Branch avoided an error by preemptively initializing."); - [self initUserSessionAndCallCallback:NO]; + [self initUserSessionAndCallCallback:NO sceneIdentifier:nil]; } } -- (void)initUserSessionAndCallCallback:(BOOL)callCallback { +- (void)initUserSessionAndCallCallback:(BOOL)callCallback sceneIdentifier:(NSString *)sceneIdentifier { dispatch_async(self.isolationQueue, ^(){ NSString *urlstring = nil; if (self.preferenceHelper.universalLinkUrl.length) { @@ -1989,25 +2111,24 @@ - (void)initUserSessionAndCallCallback:(BOOL)callCallback { } } } - + // If the session is not yet initialized if (self.initializationStatus == BNCInitStatusUninitialized) { - [self initializeSessionAndCallCallback:callCallback]; + [self initializeSessionAndCallCallback:callCallback sceneIdentifier:sceneIdentifier]; } // If the session was initialized, but callCallback was specified, do so. else if (callCallback && self.initializationStatus == BNCInitStatusInitialized) { - + // callback on main, this is generally what the client expects and maintains our previous behavior dispatch_async(dispatch_get_main_queue(), ^ { - if (self.sessionInitWithParamsCallback) { - self.sessionInitWithParamsCallback([self getLatestReferringParams], nil); - } - else if (self.sessionInitWithBranchUniversalObjectCallback) { - self.sessionInitWithBranchUniversalObjectCallback( - [self getLatestReferringBranchUniversalObject], - [self getLatestReferringBranchLinkProperties], - nil - ); + + if (self.sceneSessionInitWithCallback) { + BNCInitSessionResponse *response = [BNCInitSessionResponse new]; + response.params = [self getLatestReferringParams]; + response.universalObject = [self getLatestReferringBranchUniversalObject]; + response.linkProperties = [self getLatestReferringBranchLinkProperties]; + response.sceneIdentifier = sceneIdentifier; + self.sceneSessionInitWithCallback(response, nil); } }); } @@ -2015,7 +2136,7 @@ - (void)initUserSessionAndCallCallback:(BOOL)callCallback { } // only called from initUserSessionAndCallCallback! -- (void)initializeSessionAndCallCallback:(BOOL)callCallback { +- (void)initializeSessionAndCallCallback:(BOOL)callCallback sceneIdentifier:(NSString *)sceneIdentifier { Class clazz = [BranchInstallRequest class]; if (self.preferenceHelper.identityID) { clazz = [BranchOpenRequest class]; @@ -2025,9 +2146,9 @@ - (void)initializeSessionAndCallCallback:(BOOL)callCallback { // callback on main, this is generally what the client expects and maintains our previous behavior dispatch_async(dispatch_get_main_queue(), ^ { if (error) { - [self handleInitFailure:error callCallback:callCallback]; + [self handleInitFailure:error callCallback:callCallback sceneIdentifier:(NSString *)sceneIdentifier]; } else { - [self handleInitSuccessAndCallCallback:callCallback]; + [self handleInitSuccessAndCallCallback:callCallback sceneIdentifier:(NSString *)sceneIdentifier]; } }); }; @@ -2071,7 +2192,7 @@ - (BOOL)removeInstallOrOpen { } } -- (void)handleInitSuccessAndCallCallback:(BOOL)callCallback { +- (void)handleInitSuccessAndCallCallback:(BOOL)callCallback sceneIdentifier:(NSString *)sceneIdentifier { self.initializationStatus = BNCInitStatusInitialized; NSDictionary *latestReferringParams = [self getLatestReferringParams]; @@ -2083,8 +2204,8 @@ - (void)handleInitSuccessAndCallCallback:(BOOL)callCallback { NSString* referringLink = [self.class returnNonUniversalLink:latestReferringParams[@"~referring_link"] ]; NSURLComponents *comp = [NSURLComponents componentsWithURL:[NSURL URLWithString:referringLink] resolvingAgainstBaseURL:NO]; - - + + #pragma clang diagnostic push #pragma clang diagnostic ignored "-Warc-performSelector-leaks" Class applicationClass = NSClassFromString(@"UIApplication"); @@ -2096,14 +2217,14 @@ - (void)handleInitSuccessAndCallCallback:(BOOL)callCallback { } if (callCallback) { - if (self.sessionInitWithParamsCallback) { - self.sessionInitWithParamsCallback(latestReferringParams, nil); - } else if (self.sessionInitWithBranchUniversalObjectCallback) { - self.sessionInitWithBranchUniversalObjectCallback( - [self getLatestReferringBranchUniversalObject], - [self getLatestReferringBranchLinkProperties], - nil - ); + + if (self.sceneSessionInitWithCallback) { + BNCInitSessionResponse *response = [BNCInitSessionResponse new]; + response.params = [self getLatestReferringParams]; + response.universalObject = [self getLatestReferringBranchUniversalObject]; + response.linkProperties = [self getLatestReferringBranchLinkProperties]; + response.sceneIdentifier = sceneIdentifier; + self.sceneSessionInitWithCallback(response, nil); } } [self sendOpenNotificationWithLinkParameters:latestReferringParams error:nil]; @@ -2111,7 +2232,7 @@ - (void)handleInitSuccessAndCallCallback:(BOOL)callCallback { if (!self.URLBlackList.hasRefreshedBlackListFromServer) { [self.URLBlackList refreshBlackListFromServerWithCompletion:nil]; } - + if (self.shouldAutomaticallyDeepLink) { dispatch_async(dispatch_get_main_queue(), ^ { [self automaticallyDeeplinkWithReferringParams:latestReferringParams]; @@ -2138,7 +2259,7 @@ - (void)automaticallyDeeplinkWithReferringParams:(NSDictionary *)latestReferring BNCLogWarning(@"The automatic deeplink view controller '%@' for key '%@' does not implement 'configureControlWithData:'.", branchSharingController, key); } - + self.deepLinkPresentingController = [UIViewController bnc_currentViewController]; if([self.deepLinkControllers[key] isKindOfClass:[BNCDeepLinkViewControllerInstance class]]) { BNCDeepLinkViewControllerInstance* deepLinkInstance = self.deepLinkControllers[key]; @@ -2295,19 +2416,18 @@ - (void)presentSharingViewController:(UIViewController #endif -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000 -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpartial-availability" - #if __has_feature(modules) @import CoreSpotlight; @import MobileCoreServices; @@ -24,19 +20,24 @@ #import #endif +NS_ASSUME_NONNULL_BEGIN + @interface BranchCSSearchableItemAttributeSet : CSSearchableItemAttributeSet -- (id)init; -- (id)initWithContentType:(NSString *)type; -- (void)indexWithCallback:(void (^) (NSString * url, - NSString * spotlightIdentifier, - NSError * error))callback; +- (instancetype)init; + +#ifdef __IPHONE_14_0 +- (instancetype)initWithContentType:(UTType *)contentType NS_AVAILABLE(10_16, 14_0); +#endif -@property (nonatomic, strong) NSDictionary *params; -@property (nonatomic, strong) NSSet *keywords; -@property (nonatomic) BOOL publiclyIndexable; //!< Defaults to YES +- (instancetype)initWithItemContentType:(NSString *)type; + +- (void)indexWithCallback:(void (^) (NSString * _Nullable url, NSString * _Nullable spotlightIdentifier, NSError * _Nullable error))callback; + +@property (nonatomic, strong, nullable) NSDictionary *params; +@property (nonatomic, strong, nullable) NSSet *keywords; +@property (nonatomic) BOOL publiclyIndexable; //!< Defaults to YES @end -#pragma clang diagnostic pop -#endif +NS_ASSUME_NONNULL_END diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.h.meta index 4adffe8d..16262199 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bd2123a0f1c924767bdfe63962962d09 +guid: cbb808d5e553d446cb38e9df25ded0db PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m old mode 100755 new mode 100644 index 7d2987ee..e4ef56eb --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m @@ -25,13 +25,21 @@ @interface BranchCSSearchableItemAttributeSet() @implementation BranchCSSearchableItemAttributeSet -- (id)init { - return [self initWithContentType:nil]; +- (instancetype)init { + return [self initWithItemContentType:kUTTypeGeneric]; } -- (id)initWithContentType:(NSString *)type { - NSString *typeOrDefault = type ?: (NSString *)kUTTypeGeneric; - if (self = [super initWithItemContentType:typeOrDefault]) { +#ifdef __IPHONE_14_0 +- (instancetype)initWithContentType:(nonnull UTType *)contentType { + if (self = [super initWithContentType:contentType]) { + self.publiclyIndexable = YES; + } + return self; +} +#endif + +- (instancetype)initWithItemContentType:(nonnull NSString *)type { + if (self = [super initWithItemContentType:type]) { self.publiclyIndexable = YES; } return self; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m.meta index 1d28a3fc..ab92c619 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCSSearchableItemAttributeSet.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c92125f917bed4fe1be15e9460279f10 +guid: ec5325f0ee1ec436f899bb6f53338c11 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.h.meta new file mode 100644 index 00000000..652a4a19 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 65fa6c9e98c864f0492f3c5ff696e019 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.m.meta new file mode 100644 index 00000000..fc939687 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCloseRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 5c46cbeea57f44010a70183f77a1e51a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h old mode 100755 new mode 100644 index d9f75fc6..3e2b3c91 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h @@ -97,6 +97,8 @@ extern NSString * const BRANCH_RESPONSE_KEY_SESSION_DATA; extern NSString * const BRANCH_RESPONSE_KEY_CLICKED_BRANCH_LINK; extern NSString * const BRANCH_RESPONSE_KEY_BRANCH_VIEW_DATA; extern NSString * const BRANCH_RESPONSE_KEY_BRANCH_REFERRING_LINK; +extern NSString * const BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP; +extern NSString * const BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE; extern NSString * const BRANCH_LINK_DATA_KEY_OG_TITLE; extern NSString * const BRANCH_LINK_DATA_KEY_OG_DESCRIPTION; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h.meta index 2429d891..d2f1bb86 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cfb1e7a30e43845ca8599b02b39a68ad +guid: 9faa03ad5ae29478db050b2002b5bbb1 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m old mode 100755 new mode 100644 index 596ecc60..82368eb7 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m @@ -92,6 +92,8 @@ NSString * const BRANCH_RESPONSE_KEY_CLICKED_BRANCH_LINK = @"+clicked_branch_link"; NSString * const BRANCH_RESPONSE_KEY_BRANCH_VIEW_DATA = @"branch_view_data"; NSString * const BRANCH_RESPONSE_KEY_BRANCH_REFERRING_LINK = @"~referring_link"; +NSString * const BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP = @"invoke_register_app"; +NSString * const BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE = @"update_conversion_value"; NSString * const BRANCH_LINK_DATA_KEY_OG_TITLE = @"$og_title"; NSString * const BRANCH_LINK_DATA_KEY_OG_DESCRIPTION = @"$og_description"; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m.meta index 3bffd371..b8b8b211 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchConstants.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55cad462adb704fa087c4bef1c85d9af +guid: 972516068a15644a2955c81337b977a6 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.h.meta index 53abde00..e7b13149 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d41564e5ca0849e294e15b531af1c9c +guid: 0220b1e50de81425eb1ffa7252b8bfa0 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m old mode 100755 new mode 100644 index 7fd90824..09d4f7f6 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m @@ -253,7 +253,7 @@ - (void)addFormattedContentData:(NSMutableArray *)contentDataArray contentData = [contentData substringToIndex:self.contentManifest.maxTextLen]; } if (!isClearText) { - contentData = [BNCEncodingUtils md5Encode:contentData]; + contentData = [BNCEncodingUtils sha256Encode:contentData]; } if (contentData) [contentDataArray addObject:contentData]; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m.meta index 512fdb00..f2ea2b7e 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoverer.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a22ddeeb46eb47eab8b5214075cae78 +guid: 09da8700dd0f24dad849b39bc12fbeaa PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.h.meta index ba33dac3..6e21dd31 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b152be6bfbb2e43d6b2b382004d726fd +guid: 82deec90e156e42fd9a576081a25be22 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m.meta index 51d7e48e..ba24cc3f 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1e6145eb6c2f8464d9f8ea044bcc7185 +guid: 2046234f2e5fc40469e1f9fc129c78b4 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.h.meta index 7a5b1736..ae79fef6 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02ef442fda9454b0381689587d1cb8e4 +guid: d81d11da6b5d0421abca91441051eca5 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.m.meta index a73e466c..2c271470 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchContentPathProperties.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a41d04f465454340a5490e407184218 +guid: c2c46e053fdff4be3a7f13d580d01808 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.h.meta new file mode 100644 index 00000000..ce05f990 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: b58c5014d50574bbd8972c4799418695 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.m.meta new file mode 100644 index 00000000..f6716b48 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCreditHistoryRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: bf563b6e9e4ba4c75b126860c70f3dd0 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.h.meta index ad94a0fb..c7a42951 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 787cd25339d9848f7b6742d83b7d35f2 +guid: 691740ae866ca4f7f844be52c57dbf85 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,83 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.m.meta index c12ab330..4186ed35 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchCrossPlatformID.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7441224e1f8c74be4a0ad088d0732284 +guid: 0bad485fac8a4428bb1c2fce4b55fd8e PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,25 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -40,54 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDeepLinkingController.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDeepLinkingController.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDeepLinkingController.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDeepLinkingController.h.meta index f267e622..846c7c50 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDeepLinkingController.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDeepLinkingController.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 36cfeb8fe7f2d48679842a5553b354f9 +guid: bec187279406a4426be8d1e553b234a8 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.h.meta index 2f28b3b0..7e2160d6 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c7843a1118a14c8f8cd209708b454cd +guid: 7a3066f3e0c6c494fb435c3b35e32960 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.m.meta index f6a1f3fd..3a9fb4b2 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchDelegate.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 507ccb5dfd01149ceb5a27eb01b4ed78 +guid: 5d6562ad6b8204896a370c30c8cb65b2 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h old mode 100755 new mode 100644 index 58db6488..fb127bf8 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h @@ -88,7 +88,26 @@ typedef NS_ENUM(NSInteger, BranchEventAdType) { @property (nonatomic, copy) NSArray*_Nonnull contentItems; @property (nonatomic, copy) NSDictionary *_Nonnull customData; -- (void) logEvent; //!< Logs the event on the Branch server. +/** + Logs the event on the Branch server. + This version will callback on success/failure. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + */ +- (void)logEventWithCompletion:(void (^_Nullable)(BOOL success, NSError * _Nullable error))completion; + +/** + Logs the event on the Branch server. + This version automatically caches and retries as necessary. + + This method should only be invoked after initSession. + If it is invoked before, then we will silently initialize the SDK before the callback has been set, in order to carry out this method's required task. + As a result, you may experience issues where the initSession callback does not fire. Again, the solution to this issue is to only invoke this method after you have invoked initSession. + */ +- (void)logEvent; + - (NSDictionary*_Nonnull) dictionary; //!< Returns a dictionary representation of the event. - (NSString* _Nonnull) description; //!< Returns a string description of the event. @end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h.meta index ae18378b..51a1e66a 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e8a0d415f23a440187a2b1d3dbf86c4 +guid: e29f013813dd945eb981d72bcb1bcf73 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m old mode 100755 new mode 100644 index 3c3f3f4a..b8c297f0 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m @@ -8,6 +8,9 @@ #import "BranchEvent.h" #import "BNCLog.h" +#import "BNCCallbackMap.h" +#import "BNCReachability.h" +#import "BNCSKAdNetwork.h" #pragma mark BranchStandardEvents @@ -67,15 +70,20 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface callback:callback]; } -- (void)processResponse:(BNCServerResponse*)response - error:(NSError*)error { - NSDictionary *dictionary = - ([response.data isKindOfClass:[NSDictionary class]]) - ? (NSDictionary*) response.data - : nil; - - if (self.completion) +- (void)processResponse:(BNCServerResponse*)response error:(NSError*)error { + NSDictionary *dictionary = ([response.data isKindOfClass:[NSDictionary class]]) + ? (NSDictionary*) response.data : nil; + + if (dictionary) { + NSNumber *conversionValue = (NSNumber *)dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE]; + if (conversionValue) { + [[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue]; + } + } + + if (self.completion) { self.completion(dictionary, error); + } } #pragma mark BranchEventRequest NSSecureCoding @@ -179,7 +187,7 @@ - (NSDictionary*) dictionary { addString(coupon, coupon); addString(affiliation, affiliation); addString(eventDescription, description); - addString(searchQuery, search_query) + addString(searchQuery, search_query); addDictionary(customData, custom_data); #include "BNCFieldDefines.h" @@ -220,18 +228,36 @@ - (NSDictionary*) dictionary { ]; } -- (void) logEvent { - +- (void)logEventWithCompletion:(void (^_Nullable)(BOOL success, NSError * _Nullable error))completion { if (![_eventName isKindOfClass:[NSString class]] || _eventName.length == 0) { BNCLogError(@"Invalid event type '%@' or empty string.", NSStringFromClass(_eventName.class)); + if (completion) { + NSError *error = [NSError branchErrorWithCode:BNCGeneralError localizedMessage: @"Invalid event type"]; + completion(NO, error); + } + return; + } + + // logEvent requests without a completion are automatically retried later + if (completion != nil && [[BNCReachability shared] reachabilityStatus] == nil) { + if (completion) { + NSError *error = [NSError branchErrorWithCode:BNCGeneralError localizedMessage: @"No connectivity"]; + completion(NO, error); + } return; } NSDictionary *eventDictionary = [self buildEventDictionary]; BranchEventRequest *request = [self buildRequestWithEventDictionary:eventDictionary]; + [[BNCCallbackMap shared] storeRequest:request withCompletion:completion]; + [[Branch getInstance] sendServerRequest:request]; } +- (void) logEvent { + [self logEventWithCompletion:nil]; +} + - (BranchEventRequest *)buildRequestWithEventDictionary:(NSDictionary *)eventDictionary { BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper]; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m.meta index c5859543..02d1b46b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchEvent.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 812a9a7be583044c8840e04f6400fbf3 +guid: ee7d1b69f570e4656bf39fec0e1f860d PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.h.meta new file mode 100644 index 00000000..215a2831 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 0bb64fd10b2c04e94909c38c94578c0e +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.m.meta new file mode 100644 index 00000000..a702c3f5 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchInstallRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 1b8b740f4acc84e24b5429cb5983c26f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.h.meta new file mode 100644 index 00000000..fcd0e2b3 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 5285277894cee4ace9f10e428dceec2a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.m.meta new file mode 100644 index 00000000..6ce444c4 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLATDRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: d6b8e1ed8505b4302aaa39b67cbc656e +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.h.meta index a6229383..8a29bcd2 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bf3c1635d58b94264845e2fe2f876395 +guid: 591008ac668994741a5d72eaab584ca0 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,83 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.m.meta index ca5fd704..9612b314 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLastAttributedTouchData.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d870b10a51edd4761af4b194a80fcb77 +guid: f71e9371d021d46579532fccf38d07cd PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,25 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -40,54 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.h.meta index afa23b10..ac11e0fc 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aaec8c61b9faa44398bb9fa6d35fb34a +guid: 94d244b7e83f34cce8871e0ae93a7693 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.m.meta index f4630c3f..c88138e7 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLinkProperties.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 194423c421fc542d7847b25be5ac80f3 +guid: bf5dbf1edeac846bbb4993cf1d42c51e PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.h.meta new file mode 100644 index 00000000..15b73033 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 6b428294252c44f9ea251bb76b2a0d1b +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.m.meta new file mode 100644 index 00000000..51dd0203 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLoadRewardsRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 95d035d140a2742ccb45bc3072c68d27 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.h.meta new file mode 100644 index 00000000..2762d6dd --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: de0ffad80730b479aa80b93bf6275c1e +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.m.meta new file mode 100644 index 00000000..75c687d3 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchLogoutRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 8ee42636545564af6b6cdce96f227e90 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.h.meta new file mode 100644 index 00000000..4fe65542 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 6125da8dd5dc74114b96b04eb90ad184 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.m old mode 100755 new mode 100644 similarity index 97% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.m index 5c2fc393..173cc4c3 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.m @@ -18,6 +18,7 @@ #import "BNCApplication.h" #import "BNCAppleReceipt.h" #import "BNCTuneUtility.h" +#import "BNCSKAdNetwork.h" @interface BranchOpenRequest () @property (assign, nonatomic) BOOL isInstall; @@ -151,6 +152,10 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error { preferenceHelper.sessionID = data[BRANCH_RESPONSE_KEY_SESSION_ID]; preferenceHelper.previousAppBuildDate = [BNCApplication currentApplication].currentBuildDate; + if (data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP]) { + [[BNCSKAdNetwork sharedInstance] registerAppForAdNetworkAttribution]; + } + if (Branch.enableFingerprintIDInCrashlyticsReports) { BNCCrashlyticsWrapper *crashlytics = [BNCCrashlyticsWrapper wrapper]; [crashlytics setObjectValue:preferenceHelper.deviceFingerprintID @@ -217,7 +222,11 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error { else { NSDictionary *sessionDataDict = [BNCEncodingUtils decodeJsonStringToDictionary:sessionData]; NSString *link = sessionDataDict[BRANCH_RESPONSE_KEY_BRANCH_REFERRING_LINK]; - if (link.length) referringURL = link; + if ([link isKindOfClass:[NSString class]]) { + if (link.length) { + referringURL = link; + } + } } // Clear link identifiers so they don't get reused on the next open diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.m.meta new file mode 100644 index 00000000..1e0038a4 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchOpenRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: c37202c2b35004d81a3388c0f813fb40 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.h.meta new file mode 100644 index 00000000..501d52c5 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 78c9008015aba4c93858e01f65fac18f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.m.meta new file mode 100644 index 00000000..732ca5cd --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRedeemRewardsRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 0eebcc3cd62004eb3bab56ffa9741436 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.h.meta new file mode 100644 index 00000000..e23ec122 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: b317dc169322a4ebc981a89389757c80 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.m.meta new file mode 100644 index 00000000..909c5e6d --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchRegisterViewRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: f0622c44efc84495eb637ea35106fbd1 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.h new file mode 100644 index 00000000..a24b2ed8 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.h @@ -0,0 +1,31 @@ +// +// BranchScene.h +// Branch +// +// Created by Ernest Cho on 3/24/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +/** + Provide support for UIScene. This is only supported on iOS 13.0+, iPadOS 13.0+ +*/ +API_AVAILABLE(ios(13.0)) +@interface BranchScene : NSObject + ++ (BranchScene *)shared; + +- (void)initSessionWithLaunchOptions:(nullable NSDictionary *)options + registerDeepLinkHandler:(void (^ _Nonnull)(NSDictionary * _Nullable params, NSError * _Nullable error, UIScene * _Nullable scene))callback; + +- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity; + +- (void)scene:(UIScene *)scene openURLContexts:(NSSet *)URLContexts; + +@end + +NS_ASSUME_NONNULL_END diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.h.meta new file mode 100644 index 00000000..fc531e95 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 76e2517ef98d747ee9d940063bd20edf +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.m new file mode 100644 index 00000000..eca3d011 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.m @@ -0,0 +1,66 @@ +// +// BranchScene.m +// Branch +// +// Created by Ernest Cho on 3/24/20. +// Copyright © 2020 Branch, Inc. All rights reserved. +// + +#import "BranchScene.h" +#import "Branch.h" +#import "BNCLog.h" + +@implementation BranchScene + ++ (BranchScene *)shared NS_EXTENSION_UNAVAILABLE("BranchScene does not support Extensions") { + static BranchScene *bscene; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + bscene = [BranchScene new]; + }); + return bscene; +} + +- (void)initSessionWithLaunchOptions:(nullable NSDictionary *)options registerDeepLinkHandler:(void (^ _Nonnull)(NSDictionary * _Nullable params, NSError * _Nullable error, UIScene * _Nullable scene))callback NS_EXTENSION_UNAVAILABLE("BranchScene does not support Extensions") { + [[Branch getInstance] initSceneSessionWithLaunchOptions:options isReferrable:YES explicitlyRequestedReferrable:NO automaticallyDisplayController:NO registerDeepLinkHandler:^(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error) { + if (callback) { + if (initResponse) { + callback(initResponse.params, error, [self sceneForIdentifier:initResponse.sceneIdentifier]); + } else { + callback([NSDictionary new], error, [self sceneForIdentifier:initResponse.sceneIdentifier]); + } + } + }]; +} + +- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity NS_EXTENSION_UNAVAILABLE("BranchScene does not support Extensions") { + NSString *identifier = scene.session.persistentIdentifier; + [[Branch getInstance] continueUserActivity:userActivity sceneIdentifier:identifier]; +} + +- (void)scene:(UIScene *)scene openURLContexts:(NSSet *)URLContexts NS_EXTENSION_UNAVAILABLE("BranchScene does not support Extensions") { + if (URLContexts.count != 1) { + BNCLogWarning(@"Branch only supports a single URLContext"); + } + + UIOpenURLContext *context = [URLContexts allObjects].firstObject; + if (context) { + NSString *identifier = scene.session.persistentIdentifier; + [[Branch getInstance] sceneIdentifier:identifier openURL:context.URL sourceApplication:context.options.sourceApplication annotation:context.options.annotation]; + } +} + +- (nullable UIScene *)sceneForIdentifier:(NSString *)identifier NS_EXTENSION_UNAVAILABLE("BranchScene does not support Extensions") { + UIScene *scene = nil; + if (identifier) { + NSArray *scenes = [[[UIApplication sharedApplication] connectedScenes] allObjects]; + for (UIScene *scene in scenes) { + if ([identifier isEqualToString:scene.session.persistentIdentifier]) { + return scene; + } + } + } + return scene; +} + +@end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.m.meta new file mode 100644 index 00000000..e23084c4 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchScene.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 56a659b91ebac425a8cfccd169dd1732 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.h.meta new file mode 100644 index 00000000..7e8fd7cf --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 0781c64a78eb049559ac2356aea872fe +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.m.meta new file mode 100644 index 00000000..af93417b --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSetIdentityRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: ec9b5d70ee24e4633babfcf2f306aaa8 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.h.meta index eb8bb826..ffad1ab2 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afe7a92c1377c47218107f2ae30db553 +guid: dece4e52303194e139eb57ec3fe13cdc PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m old mode 100755 new mode 100644 index 4d777971..d8e3b1a9 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m @@ -9,10 +9,14 @@ #import "BranchShareLink.h" #import "BranchConstants.h" #import "BranchActivityItemProvider.h" -#import "BNCUserAgentCollector.h" #import "BNCAvailability.h" #import "BNCLog.h" #import "Branch.h" + +#if !TARGET_OS_TV +#import "BNCUserAgentCollector.h" +#endif + @class BranchShareActivityItem; typedef NS_ENUM(NSInteger, BranchShareActivityItemType) { @@ -278,7 +282,9 @@ - (id) shareObjectForItem:(BranchShareActivityItem*)activityItem ]]; NSString *userAgentString = nil; if (self.linkProperties.channel && [scrapers containsObject:self.linkProperties.channel]) { + #if !TARGET_OS_TV userAgentString = [BNCUserAgentCollector instance].userAgent; + #endif } NSString *URLString = [[Branch getInstance] diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m.meta index ebc2b953..a8e333f8 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShareLink.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 052dd5afb8f8446a89032b19a02f9421 +guid: 49d75b10e3a75476db0c57041a2efe4b PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.h.meta new file mode 100644 index 00000000..fe2bbb3a --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 38b36f7255c804cf8a7840e1ec3ac909 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.m.meta new file mode 100644 index 00000000..850a6a5f --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 1312af51427914622bf5b364dfa6a744 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.h.meta new file mode 100644 index 00000000..2c5d626e --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 98a16d4f1403144d8b8ee9235bcf3779 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.m.meta new file mode 100644 index 00000000..81e858b4 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchShortUrlSyncRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 7f91a0bc506fa42858518280e9cf6615 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.h.meta new file mode 100644 index 00000000..e2c45529 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: c40d69c3bbe814996a9ff21693f3d20b +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.m.meta new file mode 100644 index 00000000..b20a91f1 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchSpotlightUrlRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: fa812de010dbb47cdba1f4bfb02e47d4 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h old mode 100755 new mode 100644 index 6e8c4f8d..72c8d6eb --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h @@ -192,7 +192,7 @@ FOUNDATION_EXPORT BranchCondition _Nonnull BranchConditionRefurbished; andAlias:(nullable NSString *)alias; /// @name Share Sheet Handling - +#if !TARGET_OS_TV - (nullable UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(nonnull BranchLinkProperties *)linkProperties; @@ -244,6 +244,8 @@ FOUNDATION_EXPORT BranchCondition _Nonnull BranchConditionRefurbished; - (void)removeFromSpotlightWithCallback:(void (^_Nullable)(NSError * _Nullable error))completion; +#endif + - (NSDictionary*_Nonnull)getDictionaryWithCompleteLinkProperties:(BranchLinkProperties*_Nonnull)linkProperties; - (NSDictionary*_Nonnull)getParamsForServerRequestWithAddedLinkProperties:(BranchLinkProperties*_Nonnull)linkProperties; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h.meta index 335adbaf..25f50075 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6363107cf399e444fb81ea9e25e68b2a +guid: 217c4bcf46c81436b985c0cbd0190975 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m old mode 100755 new mode 100644 index 71547a92..844121ab --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m @@ -13,7 +13,10 @@ #import "BNCLocalization.h" #import "BNCEncodingUtils.h" #import "Branch.h" + +#if !TARGET_OS_TV #import "BNCUserAgentCollector.h" +#endif #pragma mark BranchContentSchema @@ -293,9 +296,13 @@ - (void)registerViewWithCallback:(callbackWithParams)callback { if (callback) callback([[NSDictionary alloc] init], error); return; } + + #if !TARGET_OS_TV if (self.locallyIndex) { [self listOnSpotlight]; } + #endif + [[BranchEvent standardEvent:BranchStandardEventViewItem withContentItem:self] logEvent]; if (callback) callback(@{}, nil); } @@ -317,8 +324,11 @@ - (void)userCompletedAction:(NSString *)action withState:(NSDictionary *)state { actionPayload[self.canonicalIdentifier] = linkParams; if (state) [actionPayload addEntriesFromDictionary:state]; - if ([action isEqualToString:BNCRegisterViewEvent]) + #if !TARGET_OS_TV + if ([action isEqualToString:BNCRegisterViewEvent]) { [self listOnSpotlight]; + } + #endif } } @@ -369,7 +379,11 @@ - (NSString *)getShortUrlWithLinkPropertiesAndIgnoreFirstClick:(BranchLinkProper } // user agent should be cached on startup - NSString *UAString = [BNCUserAgentCollector instance].userAgent; + NSString *UAString = nil; + #if !TARGET_OS_TV + UAString = [BNCUserAgentCollector instance].userAgent; + #endif + return [[Branch getInstance] getShortURLWithParams:[self getParamsForServerRequestWithAddedLinkProperties:linkProperties] andTags:linkProperties.tags andChannel:linkProperties.channel @@ -398,6 +412,7 @@ - (NSString *)getLongUrlWithChannel:(NSString *)channel } #pragma mark - Share Sheets +#if !TARGET_OS_TV - (UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(BranchLinkProperties *)linkProperties { if (!self.canonicalIdentifier && !self.canonicalUrl && !self.title) { @@ -609,6 +624,7 @@ - (void) removeFromSpotlightWithCallback:(void (^_Nullable)(NSError * _Nullable if (completion) completion(error); } } +#endif #pragma mark - Dictionary Methods diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m.meta index 897f5436..7b9e98c5 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUniversalObject.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee35a9ad156c34948807772183d523c9 +guid: 8ec6449c068b24b2791cad36d9de6ebf PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.h old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.h diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.h.meta new file mode 100644 index 00000000..33b25f17 --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 48e488c877ac24db8a96aca0f30bcae1 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.m old mode 100755 new mode 100644 similarity index 100% rename from BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m rename to BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.m diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.m.meta new file mode 100644 index 00000000..e617466b --- /dev/null +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BranchUserCompletedActionRequest.m.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 4f86935c04c18403e86cacfa3fbb909b +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.h.meta index 7cf219b7..4bf7577b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.h.meta @@ -1,102 +1,27 @@ fileFormatVersion: 2 -guid: 5a191373c9415454dbce0a64eeb800d4 +guid: c23f73820130e4ee8ac15dfb49b8fb33 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m old mode 100755 new mode 100644 index 21f2364d..5f100c3b --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m @@ -42,7 +42,7 @@ + (NSString *) messageForCode:(BNCErrorCode)code { [messages setObject:@"Can't redeem zero credits." forKey:@(BNCRedeemZeroCreditsError)]; [messages setObject:@"The Spotlight identifier is required to remove indexing from spotlight." forKey:@(BNCSpotlightIdentifierError)]; [messages setObject:@"Spotlight cannot remove publicly indexed content." forKey:@(BNCSpotlightPublicIndexError)]; - [messages setObject:@"The Branch user session has not been initialized." forKey:@(BNCTrackingDisabledError)]; + [messages setObject:@"User tracking is disabled and the request is not on the whitelist" forKey:@(BNCTrackingDisabledError)]; }); NSString *errorMessage = [messages objectForKey:@(code)]; diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m.meta index ed5ee680..ec192dc2 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSError+Branch.m.meta @@ -1,33 +1,16 @@ fileFormatVersion: 2 -guid: a919e76d91dd64e84b0cd28d950c4e17 +guid: 18876079c3a1f4540af1fe73ee2e7141 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -38,59 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h.meta index 437ce27d..73c3c411 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d51fa4b816bf4d6f8ed026656be9175 +guid: 4c80d0062edbb445999f14aff88816fa PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m.meta index 0b139a15..36a90c37 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 779a87e966b284e67a348a3c9980fe9c +guid: 4d990fb9dd2d84865be43b1451f91076 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.h.meta index 7a8d7821..e6445a0d 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db03eec293fd0414db56a53395c606ec +guid: 930feea7334a245798a5ecbf38fd234c PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.m.meta index 495a75a1..38035d5b 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/NSString+Branch.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2389fbd42bd684813851d2c83b77bb60 +guid: 98bec7b060fef46219bec347f7e43960 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking.meta deleted file mode 100644 index 3bda5114..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: b3cb3bce5a6ca4d3ebe33a9e4616d909 -folderAsset: yes -timeCreated: 1513011739 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.h.meta deleted file mode 100644 index fd2d65f1..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 860490188808145e2ba6229b739a18a9 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m.meta deleted file mode 100644 index d8a13552..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: af9d0afb9a7cd4d34871ac637049b0af -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkServiceProtocol.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkServiceProtocol.h.meta deleted file mode 100644 index da3341d7..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCNetworkServiceProtocol.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: cbce6352092394fa883175cddab26e26 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.h.meta deleted file mode 100644 index f6636a31..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: a0dafbbcd37ea487c91834bd2ce44186 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m deleted file mode 100755 index e4046436..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m +++ /dev/null @@ -1,960 +0,0 @@ -// -// BNCServerInterface.m -// Branch-SDK -// -// Created by Alex Austin on 6/6/14. -// Copyright (c) 2014 Branch Metrics. All rights reserved. -// - -#import "BNCServerInterface.h" -#import "BNCConfig.h" -#import "BNCEncodingUtils.h" -#import "NSError+Branch.h" -#import "BranchConstants.h" -#import "BNCDeviceInfo.h" -#import "NSMutableDictionary+Branch.h" -#import "BNCLog.h" -#import "Branch.h" -#import "BNCLocalization.h" -#import "NSString+Branch.h" - -@interface BNCServerInterface () -@property (strong) NSString *requestEndpoint; -@property (strong) id networkService; -@end - -@implementation BNCServerInterface - -- (instancetype) init { - self = [super init]; - if (!self) return self; - - self.networkService = [[Branch networkServiceClass] new]; - if ([self.networkService respondsToSelector:@selector(pinSessionToPublicSecKeyRefs:)]) { - NSError *error = [self.networkService pinSessionToPublicSecKeyRefs:self.class.publicSecKeyRefs]; - if (error) { - BNCLogError(@"Certificate pinning failed. Continuing without pinning: %@.", error); - } - } - - return self; -} - -- (void) dealloc { - [self.networkService cancelAllOperations]; - self.networkService = nil; -} - -+ (NSArray/***/*) publicSecKeyRefs { - - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wobjc-string-concatenation" - - NSArray *hexKeys = @[ - // star_branch_io.pub.p12 - @"30821d9102010330821d5706092a864886f70d010701a0821d4804821d44" - "30821d40308217f706092a864886f70d010706a08217e8308217e4020100" - "308217dd06092a864886f70d010701301c060a2a864886f70d010c010630" - "0e04081719fadd81059fec02020800808217b0b1d82a5e9c29eb4cb6fa3b" - "21e38c81d4343136db6b5961e8f58ac7d6a6a8687f1fa999743eaf23d916" - "e59c53457bcb7dd573d741fdac9c73142f76adbd1032ec5fea5145b823fe" - "74a13a6318cb404f00230bab846d1bd6f179f6667d29ad93001cfe4933ba" - "5ed90d0456ab1ef9ebb7bfb456cc5c58bec9c9cbf319911cc4733731e3a6" - "59afee427166f77ddb354c00d23fb073b22e8649dae598edfad04d58b248" - "803e6e4c8036bfee5884bd0f6a4052918ea748a7a281d019723b071ea799" - "c5748a0cd9b71b773bd38dd07c98ee8ab7e8ac3f6de898747db3e4691b5a" - "2315e17595eeee61ed95198d33fd738e8beeca09e4dbadb92b1431e5496e" - "a5a38ae64a147b2efba4b418e77f52fa38ba64f263b4e4942e0e713b9f4a" - "330b339a021f262fecb400115f3162da2849c53dd226498f781f57768d3f" - "d08cbe7e791b093515ec8154a83fad46a346f28a2e1283810491d2e8b98e" - "ac0a6622c65ddb96c3dea602d4b052898baa93d24e63d52fcc66bc8b7ab8" - "252d4bb2ee7923dda59b944c3dacd91e787786bf120cae120e7c20fedac2" - "521344f436c61f7570ac79b5862ed28e9e90186c3f350b26a15e2358efa0" - "7d73366f509646c3b5aaddeac19c1777376fb48c976d3ad0884e13619301" - "e196dbc249841c9e563e879287ae781e430711a3fd706ce3fe68897ab26c" - "3e26e71d4abf22cae06cc07e2dc3d8e3ea6f90aa926a0cb5becd93d93aa0" - "df9373d74de67b4d4242b27e5fc95506396d6e33ffb89ded52b52fd72532" - "0cda26ab555730c21fc12902204ea52670f704f90df71c46eeaea4fed60a" - "0191069274725fa072d1666965372679b5023a429a11ccf653a429f63ae4" - "512d6f83db14848f192fd8aa2c20853f5527542e51d480d951cddbc95c4c" - "863f277180170e6ef9752ad516297b42ecf70bc4e98bd1e68ee8b04b440c" - "f22cd6b7b8a3486abbca1a900b208029ff2b14c9a8ba4c4754b8d70a42b1" - "4ff1c6782084bf74f231a762270f05f62a6680f914b62007dfe0dd73f3e2" - "5f22cdf32c03fb8ec55de51b9bb7d1989813c746d9152e0391d6643985f9" - "cb5349c1f6acf219095e959ce8a91c5de8fc7d521410328e2d7b280e761b" - "1a58b1d3774b1e987f297a31058829813838d904d45d8497cf788ab0c916" - "6f8f30a97e7b8594e0779da590d58f5b7cc8fb75a055e774efb55b876608" - "f5b125ac01dfa410cde94bdd9bda54195326fd1f9d007e4e074d51bb5fbf" - "f25783e970e885f0e4a5270f4efbed66b3366a2f41636a21347c56539731" - "d5259bcddae780da9cfa873592347f18475ec417ec32ec1fe3ff36ff1aad" - "8fcd308470b152daee41bffa0123f106e17738eec27b47107a63b4b0757f" - "ab2a9be6861e2b603f5a4d2eaeedfa263ada57b559bf03f36f22e2912930" - "d8880de0a65b0f20d54c34338f5da2dbe88b092365eeff971179f3ff4a2b" - "6da7daff59cfcd0e3c9ddf75edb0a7b2c6b13b39dc7a06ea81ac9a728d06" - "67904bdb976905d4f331f6498e89ce2dc5e4f63d2285eff62d0e38f5226d" - "aeb66649791b5a780edc909f6b85ae5daf528c4adbfb7cbaaefb0ac1ef36" - "af27a7e54d5b6cbc31c9bd2d7340eb468139c1d307a5a0f9c5ee04970191" - "cd825e692802afe607b56511201b11242d50d1ca0822aa1a64ea4db13f83" - "d86340962638f0dbece4620e71d842f96fc0ad43007afac512406d68b333" - "87c6b1fb4b251d1f2b40493d1ffeb3fe81f5528d556507c5953a0eccb063" - "455cb3fcc1dee1a2d70ea3200de8cff1113f8a645ab9c3a9a0e32dee830b" - "c6b0436678a3ccdf9d359d28f4df20e6d30715211ab9f0ece94250f19c0e" - "4f77c1320697ba2beb3d2719e75c3e1c21f4c20fe35bdc004d270ee92e8b" - "63820fed3e27529081e39f9ec032dba216f5fd5506d086af0793aa574de2" - "ba7c5b1ef6f8fcfc977b0fa7380c33b631d79e9c2f65e6b8cfd4bc298c6f" - "6df9edd84220602b60e77c0ef3503c44021487e9e06806021000020c7c27" - "5a440244a4b46bec3f290bd6fb7406872ff969f0f5a8f60080c69937d084" - "4ba8721b14071de4dced03562441eec7b5f251298b318a19c31bce01947b" - "672e59b6fcdd366f11f039d0ca29b34ad2196ee108872644c7c2b36c0b1c" - "953183fb948873df04c29c06cd8d0d88412bdf09702473ddf4acf6cf8b6b" - "d360033aed2cba9e6fd9a8e092ee89655e185865173c84eeaf44d6f91459" - "17fb09acf1c7523f02e008222cdb6c92b4ef1aa083125738a86f1c6a6bed" - "c7c62cb1f862450e051e520aca4ea6dc43001d1f9f7dfb4063c4a3cbecef" - "a7cc289b6ff9236a724775ab9070ace955bef51f53a1c3bedd4991dec85e" - "d4ae058115069c4f8dffd9e0c5a7c2324da41b4cef05bd042f76ed7a552e" - "c8cc6a437e84a422607f2192b916638b0359c096fb92d2cb636e5be89538" - "5789e9ec05eaf279e5735cae74d3169294eff1283d0789046c6f04b169e0" - "be04705ae8254c0d1cc568232ebcc2243b65c86fc77e145612569565a045" - "ced0ec5a0d8b5c20f62c53925ee7beb499466a74d52641676fb12f8c005f" - "2458b9b5652dc4b8d56ac427c6d06e8059b6a09c1b39547ab033f2888fe8" - "a62a5fc57cda0fa660480d93772d35cef1e5541d562ec6aa72717bdc8eb0" - "86d77aa3700068159b67f4c2f8a5f4318aa46ce7180f1dedf54fd0ee2e08" - "954465c07d2f717637dbe55dce9f7e9b98b957c25ad9ebd7aef7f0af32b9" - "c03e952d4a926bf70800cd3b14ead5a242f8a753fdd126ecd842011f812d" - "ba1c1c2c59d96fe94494b24e5ba18ad86358a12cf805c2e9646d16b47197" - "5910ea78c0527caf49f4b3093fd5b86374b3e6e5e90597d33d74b8f29d7e" - "8e230df4e19a2dc8da85ebb8810f6ae3dc1b1e9cbe78743f5a02b9b21991" - "a71e624b5c882f8720e89b0ae8e3da2d7f7111bf5a0ae38ca8c365bfe014" - "a6a8a8b6547bab923d44bea26e03f42e741e4c2098a0b5229c13baac3c52" - "f6d20cff7174d153216f48874a0b37ad9667cb467a8e5954840133ea9b49" - "ca102a739c81d7b3cf07da4bdfd83590253d72b0f23b253876b90476978f" - "b7965b2eba9e2af849aabe496aef5e1253ef28a848b7b57625b5b0820698" - "143cf886f762fc2510ae2746a73df0b6bd7710b0b2f9a2972c22898885d6" - "dc3d10dfd726e63a2100615322a100549d9cbcbd1e9527af58624a42eb44" - "6522b1173ddead0045af72ca22740352856a07bf7d92a1e6c3720ce6cf28" - "dd44dfb391457d526e141e23932876759d130bcc593db05e1fae1e7a4480" - "6f03c31bbfd4940c23f3ed8171656c2dde108630e62ff6387b7787bf3b84" - "bf625f7016cf2a460313367843db50ce08c99cc882d37e6f16720d3959d8" - "4d9eb14a3509fccbef187647e52c1652a2963ba2af0e2dda4a821fc07876" - "dba979e31293622f696354eba78a2a13fbd9d0145e475e3344a016a1cbda" - "a333d6012695a23e9fffd9fb08467aee23d367daf78350137daa8101bdc9" - "46bf23f9129d32fe59d79dee8c35b2c710cd5e8144ec5df0582b0d1d73ee" - "52be0ed58fd2d9ca5d3641493d42f267214c9b97c7abcf59536761df604e" - "43a12c3bc272656f5ee3501f27ce40f1021c1bf02b500bd5b122c98a04b0" - "b3fd5bd7987b3e5112a9180df6d9612d8225d3e2bc921d70be3f2f6e873a" - "0dc3fc08ba2f5cfed2d2b8d497ee508cb6e78667c99ccb1ff2f601015184" - "b5520439b560cddccd590d7a95509cf5bdee6536838d4d512e9be335ae06" - "cb822db11ed4b3e9a644a19b229a41efce4818f1c9b2b2d419d66be2d6dc" - "d04d33debbdd48cf7498c60aacb00586bafca798e135688346c418db8fbd" - "9411bd4348dc790d0d31e3bc073dbe7302375b0485ae3d0e341a82dc2847" - "1bf1285605d6d7ed03f4373acd18ffca8f561c828899bfd3d333f21c488f" - "de42eb7b9b635edbfe8a5910dabed8b75783bb994fd1c44b383f6bc0ecc7" - "d055870092f27f6c15e5b0e3768a4b3204038bb2343bf2ba2888e7b9d25a" - "530886799e22f3cab9102566c097c57dfa078c944da6ea365305b3c603ac" - "f4acbb3d43fb2886ce3ba872be262978d7a3c2a3de7b3be26b35e521ad07" - "d3c2acab616c7672bea5a26a5992a23507f6afaa1151c57209956e8d3c11" - "a0d13fcc78f97b080ea1a858170550c00fc5a2c9b3b6b99b971a6e53fd59" - "32ff36141934cec6b92b6cc36a3de68ce23214718d345198bd46c6f7bc89" - "397b485149a2ced3c5939baa614e694090bbd4941909406daf213eaeb5c2" - "a152abc1e836219372c3655ab180f945ddd57683ce20b052718b9bb09328" - "c50d3b9e9839aaba310a7131a112585dc25875cc1ef43f54e102f3b679f8" - "51136de5636dca53a8b320a7fd83c463632d649fc0cdb08e51474b316949" - "b6bfecdec4f98a9ef607ec70ec7a0d320759da6625487bf64e3f031c9a14" - "5f9e7553fd44cda1082ff319c495d3da39d24a3aa8d4799740c6a71c00a4" - "5aacd20fddeeb4e25ed79f56295e90d7a6ffe85f817f1396f2ad3084b568" - "bec8e47305c0ceb4f650efe84ddd1746fd8515c67fc8f9441231943578f1" - "0d9309f0470fd88ed5766513b61864c543dbcbd5f503513fad6891bdde3b" - "d8cde30c390ebc1753f9fb6146132b096da9eea9d910d715b0abc9b9b8a2" - "225d4d1fbfdf212689f3408043ada48c7a8f3c957e5893a095f1eb616ef8" - "8a4f4d2286b9d6ee16e6292bf63c1af4689262dfeb7b1ad5f800a25fe962" - "08109fdbe1b9d045cb4eb531161f259f7d0ee05cfb44d4ed28215368c1d2" - "f8cdc31516424f766671185eb375171aa4723cd7f2a5156d3737e92a3703" - "b7560b9d53bd97de47a2b83f5b2f877a1febe759b50d37a2616700f0e043" - "b07229982c5fd4a2b89a023751bb6c926fefa56a14dad8878c3c6123106c" - "482a93de2ad34e162d092e24243a46286f17b32729303b0e3daed29cc4a5" - "b0a458f575e6063d67d8bb9fafe1fa1fb91fcb7b14c3f3015ddce212b586" - "0cef6bf27d833a273b09f25148e264bfa2491de08bf52f8eb9f3c8f140f7" - "447dfa3a2c38c06615cc83358559ea3f370982c7eeb5221720aa3ed1bb1e" - "8ea5ea2a9db403b1bb16c0d245f9c0e0d4bd41722bcc3a94b1f51faa16e0" - "d09841a5e0c6627ed567fe3657cb3b32141ee399ad7e9f11d090fca04172" - "7c3e9a3ee8948f8f10e84127781c2c9bed4f616f1810f3dfaf4bc89e564b" - "6a9f017bad8bf2a3852de3defd5c9ff92c1442081ca08e61662ede9e9389" - "b2a981662f3a4efe6f40fbb323de7df7df8713f0c27b2a8eb51afff09336" - "792bb6cf0bb19237b1b92ed03e52b9dc8528c197b703a2c792db7023403b" - "b6e700f0e0bf02634297efeb06bf9397e9283b0b37919ffef68ae54486a4" - "11e7cbc9b76d2cb30f9f873da480088a4e3aeda59996aedd98fe18f62274" - "6f01038ed9faaf0fbbc0889efbad86afc401c22be2289a2979d161cb1618" - "380dd61dc122837eec977de875a49099dfe8208b6608ed67973192f3c53c" - "fa58096c79568aae7d114454a6ef9f5d14697d6d59fde24f14ea694bb7ea" - "2ed4fbf1b16aa3ed11bd5d3d22c75ef51574d2fa4d1f0e34a919ef83b82d" - "99cfc010fb60a8d861adabe66c171ac2d2adb5f0f349ae7cb40a7affa18a" - "f72ea0cea6e1c2cfdb4f955618a0ffc57e1a2e896a39d83fc9fbe69eb349" - "a57d1fe312697542cf9192ea2021b0f9872894b87198af516fc235397112" - "5d827cf8444f432b917719d18c79b6a941ab5e243b4b02e77a67d3b23f4b" - "85d0dacff367d363a3c2c19d6a82125a54bdbaffff61e23e399c967115ba" - "5b4ec265f0575bb847635d9e0a17385c612916f401b1321da3086d33cac8" - "a09c4602acbd06e8d049bdac08dd3404ce011815d160770401f293dbd1b0" - "a713110829ec0b5318ae2e19a5a613ba8db7c06e6231f9349f9ffd0e6a5b" - "8025f26e6057d319d913a680245a541ddce8a97037d646f80ee1b1ae4597" - "10738db07ff58e7f06aaca03426d9d6f8dec2f22b60a2f71804ce77b3bd9" - "923fd6d8ee4bdf7fde3bcb9661c409d925ddcb92e6f0ff1f739900dd1316" - "f2dc2ac75fab028a4db87039f208c7b5d77b8a76f6aec96b38edeb3ea8ef" - "089b6050eeaf964892ec29a2c592c23dec14c619bb573bf5edebb41d257b" - "b6f527f852e83cfa5c0c0aef99f587306cb511689ea1b0f0e2ce1fb598b7" - "3e6866d495ad30b7ae771e4724f06e4f50d3aadab7bcbcb87cb45e9cc1b8" - "ce95ada91a48bba07902c24638135e18000c41aa5c2bcd0df7af19d5ee92" - "ba923f55d2bcb31edffe33c2ec8b5149eb5317d759e9f3084c47bf64eee7" - "921b226c7e223b668bf10f19bffc49c962aaa04ec561532469fb8f1929e9" - "f9f1bc2b9dfd0989d13a1f329016c865b489b754a60c88e558ba7f8bd71f" - "e796d6f378ee874ba37351630efcf5a4715e9107b4a93afe4d543a570bf8" - "659a31e5aa47b1caa6bce24d4797e575335f5bcd7fa7b94ebaa9f80852b4" - "c1a8e41d41903b087df44c349463e261c00944fdd07af6df9dc9aa077b42" - "7084b8069626a8b455ff54693f220c054de6c1c47c11580bacedc0a1aef0" - "e49badd0e2bb421567364f535264f0e14ea22676aff0e48b3143388c22e6" - "ccb077578f6e4686d93c9d29b91f2aa476b94cac609d9878bd8cbc51e752" - "4555acc8cbce0da2dcb26ed222ce218b2f01e25faa41b0af9fd93ce5e07e" - "5655a1e4af07f4c549800276d3276abbe48693430240059698f7b2f24a33" - "bc4df087ce12c6487ef27a3378a70327c81ba091b981003341847312f6b6" - "4ae58ea9d83f013de5a592e211fe226f229772ac35741b8bf3297aebcf8c" - "d512e2de1a79e89d3125273c875c124e4b6bae0cba2419a3e1198a505fca" - "68a60f813875b0f2322719f6ca75f8cec0e25456858619d58db1e431062e" - "ae60cccf809d213be77f1e54fa0adfb84682353a77b6e99fcdf172e13397" - "b07a1a235a506a926d3dac91bbd4f900716036c99d54108f368221745759" - "6eccefd3b06614585330e520d044ce3368805ba180ea145a4a10c35a2962" - "b927cd7d422b3a4d86a2bced9263fbd9c20f65a83f1435086524de172035" - "c4c115ee04bf9b5e5d5e07179058ce99c0c6ea2dca1182872f97488cc5bf" - "182173fe478ec7bde8bd57ce02dadd8441ecf3c0220a2e36337ec44a3bf3" - "b5e95eb35f2a1cc56ccd063a10bf1da59c55be2059220b3b5e1de9503353" - "d8a0bbaca99c0ad8271d359bab02b228411b99f588717e9ee0fd0ca645ad" - "20f4e009c01d136598daec59435728806481f9bd60f64ef320f00450a884" - "e5f9980446245ca692168ba73efd3dff64cb5d4a23dec2a4c4b4d11665bf" - "cd0c3792c1d642403c7ae678bacde4e7051b3825f5f7ea6858231d70fa5a" - "e7da4ad7ce2741a674c90f470493f22031f6ed64cfdb5989b346561bd557" - "2d12e1fcdaf7cb74064e6f3946167ac0ed35d879bc599a314245507d3026" - "57ec98d45b2c3267404b1e734af4a7c0cc531910222a75a54d34ad56e4d9" - "106b307b682166e933152f1dd60f0ffdd6c339d4f8dc7ea0df87bec294c0" - "08ceb8827064a4c42fc3b03a86fb787df25773ec0fcf30156149fe43c5e9" - "015d58933e885bf6c99089ba4ddd253a52c3853e1895df6fa8f737a04854" - "45f8f1e2fdf9de2f2093c258519cc70a5c9eea97e315e99626eea5d07296" - "df760d5aac0ae1844cf35088f09e99ce1df40d067d4ba5538bd61c55cc9f" - "a4e7cfc917b1524aa71b8ab581c687de7968e1b0de773d279c90da964a7b" - "091c8ac86c96da1da13b4ec54df0c4eb5a124b9d0b602b82e1aab2278102" - "c70bbc2b6e57641dd15199e014cb3583ee80901ea0b9a9c49404a2e169e3" - "5fddee9777c5b236bff13963517f534b5fd79ccd46086d75b91374d76de7" - "46145359e8c7561577e33dc90f3eb5e132d48202f67706e6e606bc18df24" - "6fb8adc8d5b67829049e1d614a82d9d688186189ec39374b93ccc7b291a4" - "cf6c1e5d0aa638428e2f765dda4397d5e9b0e29706b50803093d49f84eab" - "1e364e009e7205c8747461988719dd3b28945aafa1034f747c9fcd2e7fe8" - "c48f299587034ecfbeadb13a82e5a7505f4eb1beb72feaae8b342982fd63" - "eb93cc9f66b772a1e01bc6aa20a9e2eedadb4202e939b0cc34d4d6f6d530" - "0e7e29ef0a841a16bc76665b0a0807ac3e1adb3bf6ad674f349d17f82826" - "af1f4febebb5f786af625c57bf37f5c74231ce5874cd2b53bfe82c8b051d" - "8cf613e4cb0322bc600fe78d572a0d2d03e0f5e08b6c29576c871327cf87" - "f0c968f9a54fcdb58e41cc52659ae5fc48bd98212c6c371e91dabab2e581" - "79be16722b52777fd0c5f9db3d73179277bdd36971bdd9f224f12d1077a6" - "779b3e52240aca0ef4ac8eea4b3baeea36ecbb936ae9f9ff470dd52d786d" - "a3b74c3e05ee3be7e7511d8e83ffb920f7f99afc93dc102ee19d830fabd6" - "b3c0a80a364140376d6a3917974ffbbbe3d01a96ba1da6e2266a943298fc" - "fb68daebe117b4fed13619e9d6fbe8b90424493d46bb469ee7f2c3554ca0" - "a0c0729055164fbde9051f96531722bfe5bf5d323a4c28ae4ce129acf719" - "e1605be616f92ae88b8372f39bd580cf6cbd901d1a642d3082054106092a" - "864886f70d010701a08205320482052e3082052a30820526060b2a864886" - "f70d010c0a0102a08204ee308204ea301c060a2a864886f70d010c010330" - "0e04085b3bf84b13079d0002020800048204c8194223d7a0c479fc2ee690" - "d036228e05ac153a061b4cf3763afda35d3f7776ec67bbdf66edf3b9c813" - "ce1e4cf5f748a1de513ddcb80830f060eedc2864927d8b53708d6cb7b5fc" - "1da50066b60f6ab28e7566393ff667033dd11e2d6a580abec48ea8521f3e" - "956f296cb24cc3484ddf341e7ad8b19d35f309ffc0b327aef552307107a8" - "784882e1a4f4e1521a5037dc524907c67a93c4e58becf8dd4726893d7a1f" - "1c6cca488af81d4fdb7c17156fd8b9dd5f7699b4186cca9d00b6dd25e3ba" - "c09f12883fcd25fba6cfba0c6c4591500c88514cfa5c7073699975407da8" - "4f7c760301c22b7d574dbe0aa121c41fc50d5f74d28664b9b1af3ab6d0ef" - "854142d0e425cd42147e3eddedef0a8b43893466d58ac4568504b25beba5" - "9592a5af146b0769d30f523f328e54ed69e9e0499fb88d3cdfebeeb0f304" - "cc332f63c453f078f4ef960625e6f5ccaa2b9d8c71eaf5aedd0592cbf88f" - "8cdfce6ed4dcf77b8cdf90c08f196222d93116ddb18a3ebc0dba8a06af14" - "39657f1a0f832cac6a11351fce714c2a4b637e6930709b10f7f1a470258b" - "5153a5c7719a34565352c48e72ee5477bebb0a2630a7d36f1b8fca6079e3" - "cdabcf7ca0ce5ea10dfb13ce9b7815073b86dec4d758f2fa17cff3df5252" - "50a76ea9023cee3a920f8f95b965795c3d1ce2bd59e9d66280443eed94ff" - "01a042fbe21ebdbd77396edd94216cea47fcc24a5c46a6b31af99b2e4134" - "eb27030cfe98ec97b32a358ab594a2eda3f98843da4e009c21b02c27caec" - "a657cf39d04034fc21fd31f4c2ddcb69561ce6d1eb69448cb213f6d4896c" - "b47de1dd1d0421ce28b5fe501af3abab42ff9f2baf8e43b385b01db37df6" - "818a6e216b78579ef14dc91074f7f882292f934ec7ffa8d71b908a11ac77" - "5372d215453beb3f10944e3da8b5ecd23be2cc9d93e08bf32357f92082e5" - "40c3a170f10ec399ab75a34ff239832c338fe944f48d9645560d947823d8" - "285d18210870fcdbab6b20b253c9ad5a77804f786c06923dbc74bd195035" - "0b130dc85aa0b1d50a3a9947c18631d0c7e62fca02948197801dae422059" - "d078182c1d2e53d44be5e438ef0ebc6ff4943eb28c3701b2202f15841e96" - "edc9499437f47e2bf82c290049bdeec637092bcca2580c3d7b18025c9659" - "f8bb5f141c50ee2c79dd7696a7c3f55b47d62cf9bdd1345be022957e51cd" - "e17133797c4826c424f0d163a1af905e12788f016e4cfce8d57ed5512abf" - "41fe303a1b93f6dd18455a983156d59bc2bcdda69aea0fa2d2c3f54d5ac9" - "2a1ca9130106e345611c4f29796798a1f4996f3d5a3fbee6c14efe8e2f34" - "395ac7bbc3d4c5b484a0146218b1165def63c14b52cf88492bc3228b8da1" - "ae63bc904feab3a766b2867115c9d8a5ab26ea4344909e64c94eb7aef913" - "d694cd65fed02312341aa89774668bd7e302c8b377432807ccb184407196" - "b954fc86607ee5ab6bba9741955d61b8a4317971701512a1160186e5e89d" - "9b1217314a4a8632e7f3372f43b61cddff07e72f17b7d356a14cf18c6e59" - "5d9e4b3b449fbd26fb2795807ca4a5576621d803d2b0ff032d5a3c14cc3b" - "c261062844d015c9283d20414dc71e0a8bbf2a94c67b915a03edee764bdd" - "5c03e72d8cc0c66a33124aaaf777b6e58089b9e0b838eb396b828352d460" - "3023715ab2b87878d9f206210bddad1b7b701f36de4173eb1ec553e19908" - "e188b38dbd0ff3692d13894c943125302306092a864886f70d0109153116" - "041433d43dfd9efcdf7b8d8708b8cee57e9d59896bb83031302130090605" - "2b0e03021a05000414c5febe88e845ea6e974e04fc48434b2c063adc2e04" - "08e31d2b0bdc35a19302020800", - - // backup.pub.p12 - @"30820a31020103308209f706092a864886f70d010701a08209e8048209e4" - "308209e03082049706092a864886f70d010706a082048830820484020100" - "3082047d06092a864886f70d010701301c060a2a864886f70d010c010630" - "0e04085d4c303f4024c4ac02020800808204503c4cacf46cae0d5dfc7ead" - "39046850063e536759df5e2cb48c9ecad20c50aa600f3e5a29bd8df7ae53" - "5a7379df01fedba23141ccc776a05e621193dfea53cf01b8297cbc895d64" - "ad6b87208b59e58a70a0919e746402eb47acce65ce2b3368b44b0186a57f" - "adc81a55bd886e20ecad6f30d10b5f69193e603eb508636209c682f740b7" - "2f4f97f50ce157c42769f07d9d0d5c7eea2864c5fcf9b47165810c42afbd" - "82c4537742eaa15069af7acca7585f041bb54f97d37eb11b5ded9077e98c" - "b5fad12f6a5b91b4a1d201d1da7b41d2c457ced09bec8d33576bdb6ee1a3" - "aaf2b5de9c19ec97616adea7c29cf8aa7be5fda07a9adfde4343195f5fcd" - "f65154453753fd298c52ccf0f469068fa404d1faed762664ac02c35fc4da" - "8a015cd00369fcb3e8b58ff4e292dbfdcea3469469d46abc06ff99360b5b" - "993b1330a21f051c384932b3221b63b71278bb1c642ad47027df4fddc8fe" - "19231d7d3759c08d1b4decfbc85f08a6273a9820e12d5e0f23e7c1517aea" - "d6afcbe3f14339c948bed6ecc9a6c7816710186ac1daabc66e6d5caf909a" - "6e2c240b8ddc85275084fafd8be781b2d99adc411bfb110d0118d32a5482" - "d4b34c8ec833edfc0f27b8275b8785b5584277c87ca00ce9c339c8a64dfe" - "e6e0bc43d088d5974f81f4c72ab13a2b8e6bcfe8276e6b8aac0f626deb8c" - "d835f6ba6c27184cf311f75521f873dd4ebce72c99aa096db377a5120791" - "811e8ec816ebc313ea07112d7041bd6f0b86d39ba0acd15fac86ea49e22f" - "da1a743376250e89b33b9608e10d76b91ab05934748a0551bc18c0416252" - "79adea084833de8e9666757e901b9595a7ebb2e321f67efb6b728c62b3f3" - "6709ce491d33a6cb4ff53af08b0a33390959ae4f5b251a455ff2f13d8c96" - "ee1b7bc9c0711a28fcf052429c6db413e14bb4d850b42972880d6951d237" - "0de0123a29a0d13594e99ed602ab5b369542956d5e07392785fd7af7e91d" - "f9646f58591bb98d3b5efc3aebd3b4cac45285e4f99ac316d011d15072cc" - "4aa75a8fcf79ef1df10a4b8cad87d4aafc70a73ec77bd4a42eeef898a600" - "16b0cfcd5ee79d0c02992d0953fb779cb0818e78f14001931ab2b74c06cf" - "3299fcd68cbf29da5324e9741ac39fd3c66555d1311948ea8ed93406ff04" - "b59de5c56673221f04863058d429b0411762b8dfe5b0c46dd678fc32b9a0" - "1b54bdcf02508a78044fd1884cff43224b94c2bef3db0ae7a82f58f6ecf4" - "a62bbdebe7c3deddc4801a67604c7dc390d9b9f7e398942209a4cfca3e68" - "a81a797f82e1bb7b4a6105be6e7772c6f875a1c4bc6a50aca6f9f911c8d8" - "9dd8c8134203e44fc82901d4078262037d447ac0fb3166512cdb1877fea0" - "6193349d10acc5b6af7462a811adfe78ce2899eccad87f10f4ecb0c9d97b" - "12daee1c350b9729c9abc145860e192f406e0cf80db45b03386b91fe9d8e" - "028af7891b3681b5ff79cc3696e40211bc3692d85624e697205dd8611f80" - "0920956b9b814e9a89184e3d80b60a94e424fc1aba581b399e817925cdf7" - "97bcc845243bde101f87675cd03082054106092a864886f70d010701a082" - "05320482052e3082052a30820526060b2a864886f70d010c0a0102a08204" - "ee308204ea301c060a2a864886f70d010c0103300e04080a30e62339817c" - "0302020800048204c8f0f4b8734e85c4b2763da2baa5e74dae7f5f7a26a4" - "67dbd1cd36ccbfa49ab525866e8a0a6d099964250a187bebf4767870bb4b" - "7b5d3147af7c86be232377f00888d992e21572fa9238284931b39fd349a7" - "69ef7485e334408ac45b73017a65c08813d72b1a1d6bf6e2271793a58021" - "5639e3280520396ba298e4716a1dcf6853ec02f4236f2c3eac0743cc908e" - "01738ef62d4ed2dcb4264227c446cc7dc093a64345ad9cdc11d3aca666a8" - "91d8c345be73308ab4012194325df439facd71abbc7a0aeaae4c60c90b0f" - "8457b209dd1deb76709b860314dae14720d7e152091bc8dd04ea7af96785" - "024194ce868299720065b8520a94d2bb5db1b3353687cb62bedf4ee4d7b9" - "39c81b4cc6be37695f8228a9c0ce40b2603d05978748e772d5b40268993a" - "9d2e5521c3a79e203b4065d89b049ced139be6549601100138ee3968542e" - "2fd52e8307591ec5a825658a320f7e39a69566a30be654d4ec592d774002" - "6410c3f8215bf2ee373c5af3e55841785366f8f9b55ffbe5f511d71c8f26" - "4a2ee960fc017a7afbb8564b7510aeb5c3ec05b1250731af167a605897c0" - "368776a1ce36664719e0afd10fc22580a1d170a5f852b8d3a0e9fbe80f76" - "1cc40e449ffd936d963e5f95ff9b13cba96249f98711510490a5701a2f79" - "ba13e1e26dcd85704ac88c46e2c17e69c79cad76380f7d1e35dc752dae06" - "0ed8c42d2cfbbaf5fd23c19ea82ffe333d067eec52a12a83cbec72914dfe" - "a31ca9e35c715939e2362805a6cd12798bd035a20c4a504c8cc652a3010f" - "35c929f24c0fc2b3fca50fbfdd7cd6456f635e80c701651d0085eef132e5" - "fd9c8089ed7ce4193a8a8d5ea80d332f258aa7b110a6ef94b69a96fef5c9" - "4ac4f4dd6c1eff6564e7bb5cbfe818acd80b5b2d7ade528accfe69905ffc" - "1a467e65dec4fc8c04063e3634197daff410e2dc92a6411bad3e1235a6cd" - "5579ea8a1101222d7da3bd6995b609a2b25a1a93782f597e5e938e7623a9" - "3e448d06e2db34444f476929e9a50d425285b619733d9797249d1b035634" - "8afde198052fef79691571289da371bafb56e3750bd500dd1e3a424433af" - "ab44656ccd5dedb7ec8c2c970e7774495a06ceb072519360addae38aceac" - "4f27fcf117c9f527efac193625a4c5916f51e557fed555c0678cc93cc018" - "134e0edb283a71ee50237a9bb150759169fcbd7b24a75c3493a6b4194c5b" - "8cd79da37ebef2a63bc2ac9b9b75502fc0b43cdd6f942e4943804dc0ed0f" - "b4c7b101c5d5aee4f6e0a18398b35bf25c69b598e1244cc722defb5878a3" - "b3b6ea797341615cae10239736d94a63497debccc54fe2cc7a5f8d15efa2" - "f65df4fe91ffab81072f545e41dbf4c8d7f273d608e492c1c5a32268bf82" - "ed51acd729c2121027a6de1903ce4b23c13ad548647c6836ee7788918124" - "7660c55a9825babd3f086ebede5c4725618178bb0db5d17d594cabed63b6" - "83e6a500d8a6ee8b2ac287213d6710579db444730c0d9fe24649c368bce5" - "ac1e61b3ca854c1da6b9ef47d4886c6b4a1c840d644eac8d2bc1ea8f443c" - "83239d351e1fdd3ba6338a94920b382161b4519da6b6dd3ce717b24f96f4" - "acddf70a241be2ef1e964bd83c0eac927d5ccb503b5f9a06850b1f532d23" - "d6c82a4fba847d7e867bae4b950d7760e941664526e9b8f4dd98907d90ef" - "a2e8d35f8cb4294b642a29af61b5534a540befa5e71562e8efdda232fde7" - "fb6c963125302306092a864886f70d010915311604142942010915a82174" - "5e3f65fd1a7b0e1daaf6d56930313021300906052b0e03021a050004143c" - "0c50131fbfdf668827900dc7c8ca72a38609a70408d50691caa0a421c902" - "020800" - ]; - #pragma clang diagnostic pop - - NSMutableArray *array = [NSMutableArray array]; - for (NSString* hexKey in hexKeys) { - NSData *data = [BNCEncodingUtils dataFromHexString:hexKey]; - if (data) { - SecKeyRef secKey = [self publicSecKeyFromPKCS12CertChainData:data]; - if (secKey) [array addObject:(__bridge_transfer id)secKey]; - } - } - return array; -} - -+ (SecKeyRef) publicSecKeyFromPKCS12CertChainData:(NSData*)keyData { - OSStatus status = errSecSuccess; - NSArray *items = nil; - SecKeyRef secKey = NULL; - SecTrustResultType trustType = kSecTrustResultInvalid; - - // Release these - CFArrayRef itemsRef = NULL; - - NSDictionary *options = @{ - (id)kSecImportExportPassphrase: @"", - }; - if (!keyData) { - goto exit; - } - status = SecPKCS12Import((CFDataRef) keyData, (CFDictionaryRef)options, &itemsRef); - if (status != errSecSuccess || !itemsRef || CFArrayGetCount(itemsRef) == 0) goto exit; - - items = (__bridge NSArray*) itemsRef; - SecTrustRef trust = (__bridge SecTrustRef)(items[0][(id)kSecImportItemTrust]); - if (!trust) goto exit; - - status = SecTrustEvaluate(trust, &trustType); - if (trustType != kSecTrustResultInvalid) { - secKey = SecTrustCopyPublicKey(trust); - } else { - status = errSecDecode; - } - -exit: - if (secKey == NULL && status == errSecSuccess) { - status = errSecItemNotFound; - } - if (status != errSecSuccess) { - NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:nil]; - BNCLogError(@"Can't import public key from pkcs12 data: %@.", error); - } - if (itemsRef) CFRelease(itemsRef); - return secKey; -} - -#pragma mark - GET methods - -- (void)getRequest:(NSDictionary *)params - url:(NSString *)url - key:(NSString *)key - callback:(BNCServerCallback)callback { - [self getRequest:params url:url key:key retryNumber:0 callback:callback]; -} - -- (void)getRequest:(NSDictionary *)params - url:(NSString *)url - key:(NSString *)key - retryNumber:(NSInteger)retryNumber - callback:(BNCServerCallback)callback { - NSURLRequest *request = [self prepareGetRequest:params url:url key:key retryNumber:retryNumber]; - - [self genericHTTPRequest:request retryNumber:retryNumber callback:callback - retryHandler:^NSURLRequest *(NSInteger lastRetryNumber) { - return [self prepareGetRequest:params url:url key:key retryNumber:lastRetryNumber+1]; - }]; -} - -#pragma mark - POST methods - -- (void)postRequest:(NSDictionary *)post - url:(NSString *)url - key:(NSString *)key - callback:(BNCServerCallback)callback { - [self postRequest:post url:url retryNumber:0 key:key callback:callback]; -} - -- (BOOL)isV2APIURL:(NSString *)urlstring { - return [self isV2APIURL:urlstring baseURL:[self.preferenceHelper branchAPIURL]]; -} - -- (BOOL)isV2APIURL:(NSString *)urlstring baseURL:(NSString *)baseURL { - BOOL found = NO; - if (urlstring && baseURL) { - NSString *matchString = [NSString stringWithFormat:@"%@/v2/", baseURL]; - NSRange range = [urlstring rangeOfString:matchString]; - found = (range.location != NSNotFound); - } - return found; -} - -// workaround for new V1 APIs that expects different format -- (BOOL)isNewV1API:(NSString *)urlstring { - NSArray *newV1Apis = @[ BRANCH_REQUEST_ENDPOINT_CPID, BRANCH_REQUEST_ENDPOINT_LATD ]; - for (NSString *tmp in newV1Apis) { - NSRange range = [urlstring rangeOfString:tmp]; - BOOL found = (range.location != NSNotFound); - if (found) { - return YES; - } - } - return NO; -} - -// SDK-635 Follow up ticket to redesign this. The payload format should be the responsibility of the network request class. -- (NSMutableDictionary *)buildExtendedParametersForURL:(NSString *)url withPostDictionary:(NSDictionary *)post { - NSMutableDictionary *extendedParams = nil; - - // v2 endpoints expect a user data section - if ([self isV2APIURL:url]) { - extendedParams = [NSMutableDictionary new]; - if (post) { - [extendedParams addEntriesFromDictionary:post]; - } - NSDictionary *d = [[BNCDeviceInfo getInstance] v2dictionary]; - if (d.count) { - extendedParams[@"user_data"] = d; - } - - // cpid and latd endpoints expect a v2 format, except with possible customization - } else if ([self isNewV1API:url]) { - extendedParams = [NSMutableDictionary new]; - - NSMutableDictionary *tmp = [NSMutableDictionary dictionaryWithDictionary: [[BNCDeviceInfo getInstance] v2dictionary]]; - if (tmp.count) { - extendedParams[@"user_data"] = tmp; - [tmp addEntriesFromDictionary:post]; - } - - } else { - extendedParams = [self updateDeviceInfoToParams:post]; - } - return extendedParams; -} - -- (void)postRequest:(NSDictionary *)post - url:(NSString *)url - retryNumber:(NSInteger)retryNumber - key:(NSString *)key - callback:(BNCServerCallback)callback { - - NSMutableDictionary *extendedParams = [self buildExtendedParametersForURL:url withPostDictionary:post]; - NSURLRequest *request = [self preparePostRequest:extendedParams url:url key:key retryNumber:retryNumber]; - - // Instrumentation metrics - self.requestEndpoint = [self.preferenceHelper getEndpointFromURL:url]; - - [self genericHTTPRequest:request - retryNumber:retryNumber - callback:callback - retryHandler:^ NSURLRequest *(NSInteger lastRetryNumber) { - return [self preparePostRequest:extendedParams url:url key:key retryNumber:lastRetryNumber+1]; - }]; -} - -- (BNCServerResponse *)postRequestSynchronous:(NSDictionary *)post - url:(NSString *)url - key:(NSString *)key { - NSDictionary *extendedParams = [self updateDeviceInfoToParams:post]; - NSURLRequest *request = [self preparePostRequest:extendedParams url:url key:key retryNumber:0]; - return [self genericHTTPRequestSynchronous:request]; -} - -#pragma mark - Generic requests - -- (void)genericHTTPRequest:(NSURLRequest *)request callback:(BNCServerCallback)callback { - [self genericHTTPRequest:request retryNumber:0 callback:callback - retryHandler:^NSURLRequest *(NSInteger lastRetryNumber) { - return request; - }]; -} - -- (void)genericHTTPRequest:(NSURLRequest *)request - retryNumber:(NSInteger)retryNumber - callback:(BNCServerCallback)callback - retryHandler:(NSURLRequest *(^)(NSInteger))retryHandler { - - void (^completionHandler)(idoperation) = - ^void (idoperation) { - - BNCServerResponse *serverResponse = - [self processServerResponse:operation.response data:operation.responseData error:operation.error]; - [self collectInstrumentationMetricsWithOperation:operation]; - - NSError *underlyingError = operation.error; - NSInteger status = [serverResponse.statusCode integerValue]; - - // If the phone is in a poor network condition, - // iOS will return statuses such as -1001, -1003, -1200, -9806 - // indicating various parts of the HTTP post failed. - // We should retry in those conditions in addition to the case where the server returns a 500 - - // Status 53 means the request was killed by the OS because we're still in the background. - // This started happening in iOS 12 / Xcode 10 production when we're called from continueUserActivity: - // but we're not fully out of the background yet. - - BOOL isRetryableStatusCode = status >= 500 || status < 0 || status == 53; - - // Retry the request if appropriate - if (retryNumber < self.preferenceHelper.retryCount && isRetryableStatusCode) { - dispatch_time_t dispatchTime = - dispatch_time(DISPATCH_TIME_NOW, self.preferenceHelper.retryInterval * NSEC_PER_SEC); - dispatch_after(dispatchTime, dispatch_get_main_queue(), ^{ - if (retryHandler) { - BNCLogDebug(@"Retrying request with url %@", request.URL.relativePath); - // Create the next request - NSURLRequest *retryRequest = retryHandler(retryNumber); - [self genericHTTPRequest:retryRequest - retryNumber:(retryNumber + 1) - callback:callback retryHandler:retryHandler]; - } - }); - - // Do not continue on if retrying, else the callback will be called incorrectly - return; - } - - NSError *branchError = nil; - - // Wrap up bad statuses w/ specific error messages - if (status >= 500) { - branchError = [NSError branchErrorWithCode:BNCServerProblemError error:underlyingError]; - } - else if (status == 409) { - branchError = [NSError branchErrorWithCode:BNCDuplicateResourceError error:underlyingError]; - } - else if (status >= 400) { - NSString *errorString = [serverResponse.data objectForKey:@"error"]; - if (![errorString isKindOfClass:[NSString class]]) - errorString = nil; - if (!errorString) - errorString = underlyingError.localizedDescription; - if (!errorString) - errorString = BNCLocalizedString(@"The request was invalid."); - branchError = [NSError branchErrorWithCode:BNCBadRequestError localizedMessage:errorString]; - } - else if (underlyingError) { - branchError = [NSError branchErrorWithCode:BNCServerProblemError error:underlyingError]; - } - - if (branchError) { - BNCLogError(@"An error prevented request to %@ from completing: %@", - request.URL.absoluteString, branchError); - } - - // Don't call on the main queue since it might be blocked. - if (callback) - callback(serverResponse, branchError); - }; - - if (Branch.trackingDisabled) { - NSString *endpoint = request.URL.absoluteString; - - // if endpoint is not on the whitelist, fail it. - if (![self whiteListContainsEndpoint:endpoint]) { - [[BNCPreferenceHelper preferenceHelper] clearTrackingInformation]; - NSError *error = [NSError branchErrorWithCode:BNCTrackingDisabledError]; - BNCLogError(@"Network service error: %@.", error); - if (callback) { - callback(nil, error); - } - return; - } - } - - id operation = - [self.networkService networkOperationWithURLRequest:request.copy completion:completionHandler]; - [operation start]; - NSError *error = [self verifyNetworkOperation:operation]; - if (error) { - BNCLogError(@"Network service error: %@.", error); - if (callback) { - callback(nil, error); - } - return; - } -} - -- (BOOL)whiteListContainsEndpoint:(NSString *)endpoint { - BNCPreferenceHelper *prefs = [BNCPreferenceHelper preferenceHelper]; - BOOL hasIdentifier = (prefs.linkClickIdentifier.length > 0 ) || (prefs.spotlightIdentifier.length > 0 ) || (prefs.universalLinkUrl.length > 0); - - // Allow install to resolve a link. - if ([endpoint bnc_containsString:@"/v1/install"] && hasIdentifier) { - return YES; - } - - // Allow open to resolve a link. - if ([endpoint bnc_containsString:@"/v1/open"] && hasIdentifier) { - return YES; - } - - // Allow short url creation requests - if ([endpoint bnc_containsString:@"/v1/url"]) { - return YES; - } - - return NO; -} - -- (NSError*) verifyNetworkOperation:(id)operation { - - if (!operation) { - NSString *message = BNCLocalizedString( - @"A network operation instance is expected to be returned by the" - " networkOperationWithURLRequest:completion: method." - ); - NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; - return error; - } - if (![operation conformsToProtocol:@protocol(BNCNetworkOperationProtocol)]) { - NSString *message = - BNCLocalizedFormattedString( - @"Network operation of class '%@' does not conform to the BNCNetworkOperationProtocol.", - NSStringFromClass([operation class])); - NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; - return error; - } - if (!operation.startDate) { - NSString *message = BNCLocalizedString( - @"The network operation start date is not set. The Branch SDK expects the network operation" - " start date to be set by the network provider." - ); - NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; - return error; - } - if (!operation.timeoutDate) { - NSString*message = BNCLocalizedString( - @"The network operation timeout date is not set. The Branch SDK expects the network operation" - " timeout date to be set by the network provider." - ); - NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; - return error; - } - if (!operation.request) { - NSString *message = BNCLocalizedString( - @"The network operation request is not set. The Branch SDK expects the network operation" - " request to be set by the network provider." - ); - NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError localizedMessage:message]; - return error; - } - return nil; -} - -- (BNCServerResponse *)genericHTTPRequestSynchronous:(NSURLRequest *)request { - - __block BNCServerResponse *serverResponse = nil; - dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); - - id operation = - [self.networkService - networkOperationWithURLRequest:request.copy - completion:^void (idoperation) { - serverResponse = - [self processServerResponse:operation.response - data:operation.responseData error:operation.error]; - [self collectInstrumentationMetricsWithOperation:operation]; - dispatch_semaphore_signal(semaphore); - }]; - [operation start]; - NSError *error = [self verifyNetworkOperation:operation]; - if (!error) { - dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); - } - return serverResponse; -} - -#pragma mark - Internals - -- (NSURLRequest *)prepareGetRequest:(NSDictionary *)params - url:(NSString *)url - key:(NSString *)key - retryNumber:(NSInteger)retryNumber { - - NSDictionary *preparedParams = - [self prepareParamDict:params key:key retryNumber:retryNumber requestType:@"GET"]; - NSString *requestUrlString = - [NSString stringWithFormat:@"%@%@", url, [BNCEncodingUtils encodeDictionaryToQueryString:preparedParams]]; - BNCLogDebug(@"URL: %@", requestUrlString); - - NSMutableURLRequest *request = - [NSMutableURLRequest requestWithURL:[NSURL URLWithString:requestUrlString] - cachePolicy:NSURLRequestReloadIgnoringLocalCacheData - timeoutInterval:self.preferenceHelper.timeout]; - [request setHTTPMethod:@"GET"]; - [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; - - return request; -} - -- (NSURLRequest *)preparePostRequest:(NSDictionary *)params - url:(NSString *)url - key:(NSString *)key - retryNumber:(NSInteger)retryNumber { - - NSMutableDictionary *preparedParams = - [self prepareParamDict:params key:key retryNumber:retryNumber requestType:@"POST"]; - if ([self isV2APIURL:url]) { - preparedParams[@"sdk"] = nil; - } - if (Branch.trackingDisabled) { - preparedParams[@"tracking_disabled"] = (__bridge NSNumber*) kCFBooleanTrue; - preparedParams[@"local_ip"] = nil; - preparedParams[@"lastest_update_time"] = nil; - preparedParams[@"previous_update_time"] = nil; - preparedParams[@"latest_install_time"] = nil; - preparedParams[@"first_install_time"] = nil; - preparedParams[@"ios_vendor_id"] = nil; - preparedParams[@"hardware_id"] = nil; - preparedParams[@"hardware_id_type"] = nil; - preparedParams[@"is_hardware_id_real"] = nil; - preparedParams[@"device_fingerprint_id"] = nil; - preparedParams[@"identity_id"] = nil; - preparedParams[@"identity"] = nil; - preparedParams[@"update"] = nil; - } - NSData *postData = [BNCEncodingUtils encodeDictionaryToJsonData:preparedParams]; - NSString *postLength = [NSString stringWithFormat:@"%lu", (unsigned long)[postData length]]; - - BNCLogDebug(@"URL: %@.", url); - BNCLogDebug(@"Body: %@\nJSON: %@.", - preparedParams, - [[NSString alloc] initWithData:postData encoding:NSUTF8StringEncoding] - ); - - NSMutableURLRequest *request = - [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url] - cachePolicy:NSURLRequestReloadIgnoringLocalCacheData - timeoutInterval:self.preferenceHelper.timeout]; - [request setHTTPMethod:@"POST"]; - [request setValue:postLength forHTTPHeaderField:@"Content-Length"]; - [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; - [request setHTTPBody:postData]; - - return request; -} - -- (NSMutableDictionary *)prepareParamDict:(NSDictionary *)params - key:(NSString *)key - retryNumber:(NSInteger)retryNumber - requestType:(NSString *)reqType { - - NSMutableDictionary *fullParamDict = [[NSMutableDictionary alloc] init]; - [fullParamDict bnc_safeAddEntriesFromDictionary:params]; - fullParamDict[@"sdk"] = [NSString stringWithFormat:@"ios%@", BNC_SDK_VERSION]; - - // using rangeOfString instead of containsString to support devices running pre iOS 8 - if ([[[NSBundle mainBundle] executablePath] rangeOfString:@".appex/"].location != NSNotFound) { - fullParamDict[@"ios_extension"] = @(1); - } - fullParamDict[@"retryNumber"] = @(retryNumber); - fullParamDict[@"branch_key"] = key; - - NSMutableDictionary *metadata = [[NSMutableDictionary alloc] init]; - [metadata bnc_safeAddEntriesFromDictionary:self.preferenceHelper.requestMetadataDictionary]; - [metadata bnc_safeAddEntriesFromDictionary:fullParamDict[BRANCH_REQUEST_KEY_STATE]]; - if (metadata.count) { - fullParamDict[BRANCH_REQUEST_KEY_STATE] = metadata; - } - // we only send instrumentation info in the POST body request - if (self.preferenceHelper.instrumentationDictionary.count && [reqType isEqualToString:@"POST"]) { - fullParamDict[BRANCH_REQUEST_KEY_INSTRUMENTATION] = self.preferenceHelper.instrumentationDictionary; - } - - return fullParamDict; -} - -- (BNCServerResponse *)processServerResponse:(NSURLResponse *)response - data:(NSData *)data - error:(NSError *)error { - BNCServerResponse *serverResponse = [[BNCServerResponse alloc] init]; - if (!error) { - serverResponse.statusCode = @([(NSHTTPURLResponse *)response statusCode]); - serverResponse.data = [BNCEncodingUtils decodeJsonDataToDictionary:data]; - } - else { - serverResponse.statusCode = @(error.code); - serverResponse.data = error.userInfo; - } - BNCLogDebug(@"Server returned: %@.", serverResponse); - return serverResponse; -} - -- (void) collectInstrumentationMetricsWithOperation:(id)operation { - // multiplying by negative because startTime happened in the past - NSTimeInterval elapsedTime = [operation.startDate timeIntervalSinceNow] * -1000.0; - NSString *lastRoundTripTime = [[NSNumber numberWithDouble:floor(elapsedTime)] stringValue]; - NSString * brttKey = [NSString stringWithFormat:@"%@-brtt", self.requestEndpoint]; - [self.preferenceHelper clearInstrumentationDictionary]; - [self.preferenceHelper addInstrumentationDictionaryKey:brttKey value:lastRoundTripTime]; -} - -- (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict { - BNCDeviceInfo *deviceInfo = [BNCDeviceInfo getInstance]; - @synchronized (deviceInfo) { - [deviceInfo checkAdvertisingIdentifier]; - - // hardware id information. idfa, idfv or random - NSString *hardwareId = [deviceInfo.hardwareId copy]; - NSString *hardwareIdType = [deviceInfo.hardwareIdType copy]; - NSNumber *isRealHardwareId = @(deviceInfo.isRealHardwareId); - if (hardwareId != nil && hardwareIdType != nil && isRealHardwareId != nil) { - dict[BRANCH_REQUEST_KEY_HARDWARE_ID] = hardwareId; - dict[BRANCH_REQUEST_KEY_HARDWARE_ID_TYPE] = hardwareIdType; - dict[BRANCH_REQUEST_KEY_IS_HARDWARE_ID_REAL] = isRealHardwareId; - } - - // idfv is duplicated in the hardware id field when idfa is unavailable - [self safeSetValue:deviceInfo.vendorId forKey:BRANCH_REQUEST_KEY_IOS_VENDOR_ID onDict:dict]; - // idfa is only in the hardware id field - // [self safeSetValue:deviceInfo.advertiserId forKey:@"idfa" onDict:dict]; - - [self safeSetValue:deviceInfo.osName forKey:BRANCH_REQUEST_KEY_OS onDict:dict]; - [self safeSetValue:deviceInfo.osVersion forKey:BRANCH_REQUEST_KEY_OS_VERSION onDict:dict]; - [self safeSetValue:deviceInfo.osBuildVersion forKey:@"build" onDict:dict]; - [self safeSetValue:deviceInfo.extensionType forKey:@"environment" onDict:dict]; - [self safeSetValue:deviceInfo.locale forKey:@"locale" onDict:dict]; - [self safeSetValue:deviceInfo.country forKey:@"country" onDict:dict]; - [self safeSetValue:deviceInfo.language forKey:@"language" onDict:dict]; - [self safeSetValue:deviceInfo.brandName forKey:BRANCH_REQUEST_KEY_BRAND onDict:dict]; - [self safeSetValue:deviceInfo.modelName forKey:BRANCH_REQUEST_KEY_MODEL onDict:dict]; - [self safeSetValue:deviceInfo.cpuType forKey:@"cpu_type" onDict:dict]; - [self safeSetValue:deviceInfo.screenScale forKey:@"screen_dpi" onDict:dict]; - [self safeSetValue:deviceInfo.screenHeight forKey:BRANCH_REQUEST_KEY_SCREEN_HEIGHT onDict:dict]; - [self safeSetValue:deviceInfo.screenWidth forKey:BRANCH_REQUEST_KEY_SCREEN_WIDTH onDict:dict]; - [self safeSetValue:deviceInfo.carrierName forKey:@"device_carrier" onDict:dict]; - - [self safeSetValue:[deviceInfo localIPAddress] forKey:@"local_ip" onDict:dict]; - [self safeSetValue:[deviceInfo connectionType] forKey:@"connection_type" onDict:dict]; - [self safeSetValue:[deviceInfo userAgentString] forKey:@"user_agent" onDict:dict]; - - [self safeSetValue:@(deviceInfo.isAdTrackingEnabled) forKey:BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED onDict:dict]; - - [self safeSetValue:deviceInfo.applicationVersion forKey:@"app_version" onDict:dict]; - [self safeSetValue:deviceInfo.pluginName forKey:@"plugin_name" onDict:dict]; - [self safeSetValue:deviceInfo.pluginVersion forKey:@"plugin_version" onDict:dict]; - } -} - -- (NSMutableDictionary*)updateDeviceInfoToParams:(NSDictionary *)params { - NSMutableDictionary *extendedParams=[[NSMutableDictionary alloc] init]; - [extendedParams addEntriesFromDictionary:params]; - [self updateDeviceInfoToMutableDictionary:extendedParams]; - return extendedParams; -} - -- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict { - if (value) { - dict[key] = value; - } -} - -@end diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m.meta deleted file mode 100644 index 7ffd8699..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 7f8a91038056e4906ac9e29b27cb1f39 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.h.meta deleted file mode 100644 index 38c6d92b..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 9c30e6f3a4015436ca934fce51f449b5 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.m.meta deleted file mode 100644 index 4beef2ea..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 16f9d8a6619894f2b9e80c101519e031 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.h.meta deleted file mode 100644 index 04a9c5bd..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: ee9d36e35314541d79acbd83bc095884 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.m.meta deleted file mode 100644 index 8ce3ad4e..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: d748eb5b520a74985923499106f48111 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.h.meta deleted file mode 100644 index 7c3976e3..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: d59446f614d90497fa3aab3c498f64c0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.m.meta deleted file mode 100644 index 1a3e7605..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/BNCServerResponse.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: b1ab0cdb03068434d94e9bb46661fda3 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests.meta deleted file mode 100644 index 7a4778c9..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6e6e01a0fccea4a77a2aa23a41b477f2 -folderAsset: yes -timeCreated: 1513011739 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCPIDRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCPIDRequest.h.meta deleted file mode 100644 index ba943813..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCPIDRequest.h.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: 270401628dca144999d3a7fecaff37c4 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCPIDRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCPIDRequest.m.meta deleted file mode 100644 index e443827f..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCPIDRequest.m.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 472b87dee539045ee9b4172a2675741f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.h.meta deleted file mode 100644 index d9e39a08..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 693a4d61eaaa04ff4baa863002a09c52 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.m.meta deleted file mode 100644 index 81502ca7..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCloseRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 61a195004e41d48c8b92009725bb283d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h.meta deleted file mode 100644 index 46915aa0..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: e28dfc1a91f294a90889d6377e206b62 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m.meta deleted file mode 100644 index 992c46d5..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 020acd64fc91f4b63885454765df739c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.h.meta deleted file mode 100644 index f10d8de6..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 8decd640daad543a19f570602b8fde32 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.m.meta deleted file mode 100644 index ab36b38a..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchInstallRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: f0bb774d106ae4057aa601dca7503d7f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.h.meta deleted file mode 100644 index 16d214ed..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.h.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: c8ef11064f98447f99ffb66a42805afc -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.m.meta deleted file mode 100644 index 3ee36f89..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLATDRequest.m.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 27aa075dee19647cda11da0259b0fce9 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h.meta deleted file mode 100644 index fc258cdd..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: dedbcc8e01df248e498b6e062f282eff -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m.meta deleted file mode 100644 index ff61bcdc..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 5482969a0bbc94b68bf1402779b01c50 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.h.meta deleted file mode 100644 index ef9c8664..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: f9e4960daa8324fc392be7e83ca34953 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.m.meta deleted file mode 100644 index 0a9c18a1..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchLogoutRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: aea7f16b5868943a58ecf3e67cf13038 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.h.meta deleted file mode 100644 index 23fdb9fd..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: dc7a3a31998434e44a0682e11ebfc5cd -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m.meta deleted file mode 100644 index 5aac831e..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 1ce43a31a64b740ca88e655710dd7153 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h.meta deleted file mode 100644 index 13a449a8..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 36a88f36402944fe98d405a79d369cd5 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m.meta deleted file mode 100644 index 633d1955..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 8b5fe928b3f29432a83d731f856cd05f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h.meta deleted file mode 100644 index a932f14c..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 136653f09eca64f10aef21d542bd77d3 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m.meta deleted file mode 100644 index b0bdf0c3..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 421df8b52e7fa452999ca52dd755717d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h.meta deleted file mode 100644 index 77ca8dbf..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 2d605463e058d40df808cb47fa08b07e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m.meta deleted file mode 100644 index b9651bd4..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 4ad7a9c50f30342d6bd938d78eae697d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h.meta deleted file mode 100644 index 65719c56..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: fb9bf76e0ab464b7298695957a584d89 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m.meta deleted file mode 100644 index 2f7336b2..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 370c9be9e33664724912b672994121ac -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h.meta deleted file mode 100644 index 7daa167c..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: b032317b7f15a4ab3a986d3a15ed63dd -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m.meta deleted file mode 100644 index f13ed747..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 08f410684c51d45dab7c6607875031fb -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h.meta deleted file mode 100644 index 415cf17f..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 566363a364ff3432ebf053c30f2ff29f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m.meta deleted file mode 100644 index 0534735f..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 4ebc3a9e8a82f4f88874dc87b485f178 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h.meta deleted file mode 100644 index d6472137..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: f2ff6434243d642dfa717a8a92538c82 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m.meta deleted file mode 100644 index 6bac4d84..00000000 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: d1aac6dd80d9945429154f570c86d0ef -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.h b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.h old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.h.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.h.meta index 87a34443..dee5e414 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.h.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d0ed74175309c42688f040ef386bb0d6 +guid: 2b5171c7d44a64fe4a2a22c76e613e83 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,113 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.m b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.m old mode 100755 new mode 100644 diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.m.meta b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.m.meta index f27fef65..6e97bbbb 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.m.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/UIViewController+Branch.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da38dbd8473a640feb5641b740cbbe7c +guid: bf0dd01d52d19457db46220ade76c677 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,32 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Exclude tvOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: @@ -47,77 +21,17 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - CompileFlags: -fobjc-arc - FrameworkDependencies: + settings: {} - first: tvOS: tvOS second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityWrapper.unitypackage b/BranchUnityWrapper.unitypackage index da8507eb..e75baab4 100644 Binary files a/BranchUnityWrapper.unitypackage and b/BranchUnityWrapper.unitypackage differ diff --git a/Changelog.md b/Changelog.md index 6835517c..ee6724f9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ Branch Unity SDK change log +- 0.6.6 + * Updating Branch to iOS version 0.35.0 + - 0.6.5 * Supporting field 'custom event alias'