Merge pull request #264 from BranchMetrics/fftl-disabler

Fftl disabler

Author: Dan Walkowski

Branch-SDK/Branch-SDK/BNCPreferenceHelper.h

@@ -31,7 +31,6 @@
 @property (assign, nonatomic) BOOL explicitlyRequestedReferrable;
 @property (assign, nonatomic) BOOL isReferrable;
 @property (assign, nonatomic) BOOL isDebug;
-@property (assign, nonatomic) BOOL isConnectedToRemoteDebug;
 @property (assign, nonatomic) BOOL isContinuingUserActivity;
 @property (assign, nonatomic) NSInteger retryCount;
 @property (assign, nonatomic) NSTimeInterval retryInterval;

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -52,9 +52,28 @@ @interface BNCPreferenceHelper ()
 
 @implementation BNCPreferenceHelper
 
-@synthesize branchKey = _branchKey, appKey = _appKey, lastRunBranchKey = _lastRunBranchKey, appVersion = _appVersion, deviceFingerprintID = _deviceFingerprintID, sessionID = _sessionID, spotlightIdentifier = _spotlightIdentifier,
-            identityID = _identityID, linkClickIdentifier = _linkClickIdentifier, userUrl = _userUrl, userIdentity = _userIdentity, sessionParams = _sessionParams, installParams = _installParams, universalLinkUrl = _universalLinkUrl, externalIntentURI = _externalIntentURI,
-            isReferrable = _isReferrable, isDebug = _isDebug, isConnectedToRemoteDebug = _isConnectedToRemoteDebug, isContinuingUserActivity = _isContinuingUserActivity, retryCount = _retryCount, retryInterval = _retryInterval, timeout = _timeout, lastStrongMatchDate = _lastStrongMatchDate;
+@synthesize branchKey = _branchKey,
+            appKey = _appKey,
+            lastRunBranchKey = _lastRunBranchKey,
+            appVersion = _appVersion,
+            deviceFingerprintID = _deviceFingerprintID,
+            sessionID = _sessionID,
+            spotlightIdentifier = _spotlightIdentifier,
+            identityID = _identityID,
+            linkClickIdentifier = _linkClickIdentifier,
+            userUrl = _userUrl,
+            userIdentity = _userIdentity,
+            sessionParams = _sessionParams,
+            installParams = _installParams,
+            universalLinkUrl = _universalLinkUrl,
+            externalIntentURI = _externalIntentURI,
+            isReferrable = _isReferrable,
+            isDebug = _isDebug,
+            isContinuingUserActivity = _isContinuingUserActivity,
+            retryCount = _retryCount,
+            retryInterval = _retryInterval,
+            timeout = _timeout,
+            lastStrongMatchDate = _lastStrongMatchDate;
 
 + (BNCPreferenceHelper *)preferenceHelper {
     static BNCPreferenceHelper *preferenceHelper;
@@ -74,7 +93,6 @@ - (id)init {
         _retryInterval = DEFAULT_RETRY_INTERVAL;
 
         _isDebug = NO;
-        _isConnectedToRemoteDebug = NO;
         _explicitlyRequestedReferrable = NO;
         _isReferrable = [self readBoolFromDefaults:BRANCH_PREFS_KEY_IS_REFERRABLE];
     }
@@ -114,10 +132,6 @@ - (void)log:(NSString *)filename line:(int)line message:(NSString *)format, ...
         NSString *log = [NSString stringWithFormat:@"[%@:%d] %@", filename, line, [[NSString alloc] initWithFormat:format arguments:args]];
         va_end(args);
         NSLog(@"%@", log);
-        
-        if (self.isConnectedToRemoteDebug) {
-            [[Branch getInstance] log:log];
-        }
     }
 }
 

Branch-SDK/Branch-SDK/BNCServerRequestQueue.m

@@ -10,7 +10,6 @@
 #import "BNCPreferenceHelper.h"
 #import "BranchCloseRequest.h"
 #import "BranchOpenRequest.h"
-#import "BNCDebugRequest.h"
 
 NSString * const BRANCH_QUEUE_FILE = @"BNCServerRequestQueue";
 NSUInteger const BATCH_WRITE_TIMEOUT = 3;
@@ -199,7 +198,7 @@ - (void)persistToDisk {
             NSMutableArray *encodedRequests = [[NSMutableArray alloc] init];
             for (BNCServerRequest *req in requestsToPersist) {
                 // Don't persist these requests
-                if ([req isKindOfClass:[BranchCloseRequest class]] || [req isKindOfClass:[BNCDebugRequest class]]) {
+                if ([req isKindOfClass:[BranchCloseRequest class]]) {
                     continue;
                 }
 
@@ -250,7 +249,7 @@ - (void)retrieve {
         }
 
         // Throw out persisted close requests
-        if ([request isKindOfClass:[BranchCloseRequest class]] || [request isKindOfClass:[BNCDebugRequest class]]) {
+        if ([request isKindOfClass:[BranchCloseRequest class]]) {
             continue;
         }
 

Branch-SDK/Branch-SDK/Branch.h

@@ -1449,13 +1449,6 @@ typedef NS_ENUM(NSUInteger, BranchPromoCodeUsageType) {
  */
 - (id)initWithInterface:(BNCServerInterface *)interface queue:(BNCServerRequestQueue *)queue cache:(BNCLinkCache *)cache preferenceHelper:(BNCPreferenceHelper *)preferenceHelper key:(NSString *)key;
 
-/**
- Method for logging a message to the Branch server, used when remote debugging is enabled.
- 
- @warning This is meant for use internally only (exposed for the sake of testing) and should not be used by apps.
- */
-- (void)log:(NSString *)log;
-
 /**
  Method used by BranchUniversalObject to register a view on content
  

Branch-SDK/Branch-SDK/Branch.m

@@ -35,9 +35,6 @@
 #import "BranchCloseRequest.h"
 #import "BranchOpenRequest.h"
 #import "BranchInstallRequest.h"
-#import "BranchConnectDebugRequest.h"
-#import "BranchDisconnectDebugRequest.h"
-#import "BranchLogRequest.h"
 #import "BranchSpotlightUrlRequest.h"
 #import "BranchRegisterViewRequest.h"
 
@@ -57,17 +54,12 @@
 NSString * const BRANCH_INIT_KEY_PHONE_NUMBER = @"+phone_number";
 NSString * const BRANCH_INIT_KEY_IS_FIRST_SESSION = @"+is_first_session";
 NSString * const BRANCH_INIT_KEY_CLICKED_BRANCH_LINK = @"+clicked_branch_link";
-
 NSString * const BRANCH_PUSH_NOTIFICATION_PAYLOAD_KEY = @"branch";
 
-static int BNCDebugTriggerDuration = 3;
-static int BNCDebugTriggerFingers = 4;
-static int BNCDebugTriggerFingersSimulator = 2;
+@interface Branch() <BranchDeepLinkingControllerCompletionDelegate>
 
-@interface Branch() <UIGestureRecognizerDelegate, BranchDeepLinkingControllerCompletionDelegate>
 
 @property (strong, nonatomic) BNCServerInterface *bServerInterface;
-
 @property (strong, nonatomic) NSTimer *sessionTimer;
 @property (strong, nonatomic) BNCServerRequestQueue *requestQueue;
 @property (strong, nonatomic) dispatch_semaphore_t processing_sema;
@@ -267,7 +259,6 @@ - (void)accountForFacebookSDKPreventingAppLaunch {
     self.accountForFacebookSDK = YES;
 }
 
-
 #pragma mark - InitSession Permutation methods
 
 - (void)initSession {
@@ -1051,14 +1042,6 @@ - (void)applyPromoCode:(NSString *)code useOld:(BOOL)useOld callback:(callbackWi
 }
 
 
-#pragma mark - Logging
-- (void)log:(NSString *)log {
-    BranchLogRequest *request = [[BranchLogRequest alloc] initWithLog:log];
-    [self.requestQueue enqueue:request];
-    [self processNextQueueItem];
-}
-
-
 #pragma mark - Private methods
 
 + (Branch *)getInstanceInternal:(NSString *)key returnNilIfNoCurrentInstance:(BOOL)returnNilIfNoCurrentInstance {
@@ -1224,8 +1207,6 @@ - (void)applicationDidBecomeActive {
     if (!self.isInitialized && !self.preferenceHelper.isContinuingUserActivity && ![self.requestQueue containsInstallOrOpen]) {
         [self initUserSessionAndCallCallback:YES];
     }
-    
-    [self addDebugGestureRecognizer];
 }
 
 - (void)applicationWillResignActive {
@@ -1480,79 +1461,4 @@ - (void)deepLinkingControllerCompleted {
 }
 
 
-#pragma mark - Debugger functions
-
-- (void)addDebugGestureRecognizer {
-    [self addGesterRecognizer:@selector(connectToDebug:)];
-}
-
-- (void)addCancelDebugGestureRecognizer {
-    [self addGesterRecognizer:@selector(endRemoteDebugging:)];
-}
-
-- (void)addGesterRecognizer:(SEL)action {
-    UIWindow *window = [UIApplication sharedApplication].keyWindow;
-    [window removeGestureRecognizer:self.debugGestureRecognizer]; // Remove existing gesture
-    
-    self.debugGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:action];
-    self.debugGestureRecognizer.delegate = self;
-    self.debugGestureRecognizer.minimumPressDuration = BNCDebugTriggerDuration;
-    
-    if ([BNCSystemObserver isSimulator]) {
-        self.debugGestureRecognizer.numberOfTouchesRequired = BNCDebugTriggerFingersSimulator;
-    }
-    else {
-        self.debugGestureRecognizer.numberOfTouchesRequired = BNCDebugTriggerFingers;
-    }
-    
-    [window addGestureRecognizer:self.debugGestureRecognizer];
-}
-
-- (void)connectToDebug:(UILongPressGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateBegan){
-        NSLog(@"======= Start Debug Session =======");
-        BranchConnectDebugRequest *request = [[BranchConnectDebugRequest alloc] initWithCallback:^(BOOL success, NSError *error) {
-            [self startRemoteDebugging];
-        }];
-        
-        [self.requestQueue enqueue:request];
-        [self processNextQueueItem];
-    }
-}
-
-- (void)startRemoteDebugging {
-    NSLog(@"======= Connected to Branch Remote Debugger =======");
-    
-    [[UIApplication sharedApplication].keyWindow removeGestureRecognizer:self.debugGestureRecognizer];
-    [self addCancelDebugGestureRecognizer];
-    
-    //TODO: change to send screenshots instead in future
-    if (!self.debugHeartbeatTimer || !self.debugHeartbeatTimer.isValid) {
-        self.debugHeartbeatTimer = [NSTimer scheduledTimerWithTimeInterval:20 target:self selector:@selector(keepDebugAlive) userInfo:nil repeats:YES];
-    }
-}
-
-- (void)endRemoteDebugging:(UILongPressGestureRecognizer *)sender {
-    NSLog(@"======= End Debug Session =======");
-    
-    [[UIApplication sharedApplication].keyWindow removeGestureRecognizer:sender];
-    BranchDisconnectDebugRequest *request = [[BranchDisconnectDebugRequest alloc] init];
-    [self.requestQueue enqueue:request];
-    [self processNextQueueItem];
-    
-    [self.debugHeartbeatTimer invalidate];
-    [self addDebugGestureRecognizer];
-}
-
-- (void)keepDebugAlive {
-    NSLog(@"[Branch Debug] Sending Keep Alive");
-    [self log:@""];
-}
-
-#pragma mark - UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
-    return YES;
-}
-
 @end