Optional Frameworks (AIS-290) (#645)

* Siloed off Fabric calls.
* Removed CoreTelephony.
* Made SafariServices an optional podspec.

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCFabricAnswers.h

@@ -10,7 +10,7 @@
 
 @interface BNCFabricAnswers : NSObject
 
++ (NSDictionary*) branchConfigurationDictionary;
 + (void)sendEventWithName:(NSString*)name andAttributes:(NSDictionary*)attributes;
-+ (NSDictionary *)prepareBranchDataForAnswers:(NSDictionary *)dictionary;
 
 @end

Branch-SDK/Branch-SDK/BNCFabricAnswers.m

@@ -6,9 +6,11 @@
 //  Copyright © 2016 Branch Metrics. All rights reserved.
 //
 
+#import "Branch.h"
 #import "BNCFabricAnswers.h"
 #import "BNCPreferenceHelper.h"
 #import "../Fabric/Answers.h"
+#import "../Fabric/Fabric+FABKits.h"
 
 @implementation BNCFabricAnswers
 
@@ -51,4 +53,19 @@ + (NSDictionary *)prepareBranchDataForAnswers:(NSDictionary *)dictionary {
     return temp;
 }
 
++ (NSDictionary*) branchConfigurationDictionary {
+    Class fabric = NSClassFromString(@"Fabric");
+    if ([fabric respondsToSelector:@selector(configurationDictionaryForKitClass:)]) {
+
+        // The name of this key was specified in the account-creation API integration
+        NSString * const BNC_BRANCH_FABRIC_APP_KEY_KEY = @"branch_key";
+
+        NSDictionary *configDictionary = [fabric configurationDictionaryForKitClass:[Branch class]];
+        NSDictionary *dictionary = [configDictionary objectForKey:BNC_BRANCH_FABRIC_APP_KEY_KEY];
+
+        return dictionary;
+    }
+    return nil;
+}
+
 @end

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -11,7 +11,7 @@
 #import "BNCConfig.h"
 #import "Branch.h"
 #import "BNCLog.h"
-#import "../Fabric/Fabric+FABKits.h"
+#import "BNCFabricAnswers.h"
 
 static const NSTimeInterval DEFAULT_TIMEOUT = 5.5;
 static const NSTimeInterval DEFAULT_RETRY_INTERVAL = 0;
@@ -56,7 +56,6 @@ @interface BNCPreferenceHelper () {
 @property (strong, nonatomic) NSMutableDictionary *creditsDictionary;
 @property (strong, nonatomic) NSMutableDictionary *requestMetadataDictionary;
 @property (strong, nonatomic) NSMutableDictionary *instrumentationDictionary;
-@property (assign, nonatomic) BOOL isUsingLiveKey;
 
 @end
 

Branch-SDK/Branch-SDK/BNCStrongMatchHelper.m

@@ -286,7 +286,10 @@ - (BOOL) willLoadViewControllerWithURL:(NSURL*)matchURL {
     //  when it is.
 
     Class SFSafariViewControllerClass = NSClassFromString(@"SFSafariViewController");
-    if (!SFSafariViewControllerClass) return NO;
+    if (!SFSafariViewControllerClass) {
+        BNCLogWarning(@"cookieBasedMatching is enabled but SafariServices framework is not available.");
+        return NO;
+    }
 
     Class BNCMatchViewControllerSubclass = NSClassFromString(@"BNCMatchViewController_Safari");
     if (!BNCMatchViewControllerSubclass) {

Branch-SDK/Branch-SDK/Branch.m

@@ -36,10 +36,8 @@
 #import "BranchContentDiscoverer.h"
 #import "NSMutableDictionary+Branch.h"
 #import "BNCLog.h"
-
-//Fabric
-#import "../Fabric/FABKitProtocol.h"
-#import "../Fabric/Fabric+FABKits.h"
+#import "BNCFabricAnswers.h"
+#import "../Fabric/FABKitProtocol.h" // Fabric
 
 NSString * const BRANCH_FEATURE_TAG_SHARE = @"share";
 NSString * const BRANCH_FEATURE_TAG_REFERRAL = @"referral";
@@ -275,11 +273,7 @@ + (NSString*) branchKey {
             [[[NSBundle mainBundle] infoDictionary] objectForKey:BNC_BRANCH_FABRIC_APP_KEY_KEY];
 
         if (!branchDictionary) {
-            Class fabric = NSClassFromString(@"Fabric");
-            if ([fabric respondsToSelector:@selector(configurationDictionaryForKitClass:)]) {
-                NSDictionary *configDictionary = [fabric configurationDictionaryForKitClass:[Branch class]];
-                branchDictionary = [configDictionary objectForKey:BNC_BRANCH_FABRIC_APP_KEY_KEY];
-            }
+            branchDictionary = [BNCFabricAnswers branchConfigurationDictionary];
         }
 
         NSString *branchKey = nil;

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		4665AF261B28B9BB00184037 /* BranchConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4665AF251B28B9BB00184037 /* BranchConstants.m */; };
 		4665AF281B28C1DE00184037 /* BranchLogoutRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4665AF271B28C1DE00184037 /* BranchLogoutRequestTests.m */; };
 		466B584F1B17775900A69EDE /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BBCF271A69E49A009C7DAE /* AdSupport.framework */; };
-		466B58511B17776000A69EDE /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 466B58501B17776000A69EDE /* CoreTelephony.framework */; };
 		466B58521B17776500A69EDE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670016631940F51400A9E103 /* Foundation.framework */; };
 		466B58531B17776A00A69EDE /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670016671940F51400A9E103 /* UIKit.framework */; };
 		466B58551B17779C00A69EDE /* Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 670016BE1946309100A9E103 /* Branch.m */; };
@@ -333,7 +332,6 @@
 			files = (
 				466B58531B17776A00A69EDE /* UIKit.framework in Frameworks */,
 				466B58521B17776500A69EDE /* Foundation.framework in Frameworks */,
-				466B58511B17776000A69EDE /* CoreTelephony.framework in Frameworks */,
 				466B584F1B17775900A69EDE /* AdSupport.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Branch-TestBed/Branch-TestBed/AppDelegate.m

@@ -28,7 +28,7 @@ - (BOOL)application:(UIApplication *)application
     Branch *branch = [Branch getInstance];
 
     // Comment / un-comment to toggle debugging:
-    [branch setDebug];
+    // [branch setDebug];
 
     // For Apple Search Ads
     [branch delayInitToCheckForSearchAds];

Branch.podspec

@@ -16,18 +16,25 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
   s.license          = 'Proprietary'
   s.author           = { "Branch" => "[email protected]" }
   s.source           = { :git => "https://github.com/BranchMetrics/iOS-Deferred-Deep-Linking-SDK.git", :tag => s.version.to_s }
-  s.platform     = :ios, '7.0'
-  s.requires_arc = true
+  s.platform         = :ios, '7.0'
+  s.requires_arc     = true
 
   s.subspec 'Core' do |core|
     core.source_files = "Branch-SDK/Branch-SDK/*.{h,m}", "Branch-SDK/Branch-SDK/Requests/*.{h,m}", "Branch-SDK/Fabric/*.h"
     core.private_header_files = "Branch-SDK/Fabric/*.h"
-    core.frameworks = 'AdSupport', 'CoreTelephony', 'MobileCoreServices'
+    core.frameworks = 'AdSupport', 'MobileCoreServices'
   end
 
   s.subspec 'without-IDFA' do |idfa|
     idfa.source_files = "Branch-SDK/Branch-SDK/*.{h,m}", "Branch-SDK/Branch-SDK/Requests/*.{h,m}", "Branch-SDK/Fabric/*.h"
     idfa.private_header_files = "Branch-SDK/Fabric/*.h"
-    idfa.frameworks = 'CoreTelephony', 'MobileCoreServices'
+    idfa.frameworks = 'MobileCoreServices'
   end
+
+  s.subspec 'without-Safari' do |safari|
+    core.source_files = "Branch-SDK/Branch-SDK/*.{h,m}", "Branch-SDK/Branch-SDK/Requests/*.{h,m}", "Branch-SDK/Fabric/*.h"
+    core.private_header_files = "Branch-SDK/Fabric/*.h"
+    core.frameworks = 'AdSupport', 'MobileCoreServices'
+  end
+
 end