Merge pull request #386 from BranchMetrics/clean-up

Clean up referral code, promo code and deprecated methods

Author: aaustin

Branch-SDK/Branch-SDK/BNCConfig.h

@@ -20,7 +20,7 @@
 #endif
 
 #ifdef BNC_STAGE_ENV
-#define BNC_API_BASE_URL        @"http://api.dev.branchmetrics.io"
+#define BNC_API_BASE_URL        @"http://api.dev.branch.io"
 #endif
 
 #define BNC_LINK_URL             @"https://bnc.lt"

Branch-SDK/Branch-SDK/BNCError.h

@@ -13,7 +13,6 @@ FOUNDATION_EXPORT NSString * const BNCErrorDomain;
 enum {
     BNCInitError = 1000,
     BNCDuplicateResourceError,
-    BNCInvalidPromoCodeError,
     BNCRedeemCreditsError,
     BNCBadRequestError,
     BNCServerProblemError,

Branch-SDK/Branch-SDK/BNCPreferenceHelper.h

@@ -28,8 +28,6 @@
 @property (strong, nonatomic) NSString *userIdentity;
 @property (strong, nonatomic) NSString *sessionParams;
 @property (strong, nonatomic) NSString *installParams;
-@property (assign, nonatomic) BOOL explicitlyRequestedReferrable;
-@property (assign, nonatomic) BOOL isReferrable;
 @property (assign, nonatomic) BOOL isDebug;
 @property (assign, nonatomic) BOOL shouldWaitForInit;
 @property (assign, nonatomic) BOOL suppressWarningLogs;
@@ -59,11 +57,6 @@
 - (NSInteger)getCreditCount;
 - (NSInteger)getCreditCountForBucket:(NSString *)bucket;
 
-- (void)setActionTotalCount:(NSString *)action withCount:(NSInteger)count;
-- (void)setActionUniqueCount:(NSString *)action withCount:(NSInteger)count;
-- (NSInteger)getActionTotalCount:(NSString *)action;
-- (NSInteger)getActionUniqueCount:(NSString *)action;
-
 - (void)updateBranchViewCount:(NSString *)branchViewID;
 - (NSInteger)getBranchViewCount:(NSString *)branchViewID;
 

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -33,17 +33,12 @@
 NSString * const BRANCH_PREFS_KEY_SESSION_PARAMS = @"bnc_session_params";
 NSString * const BRANCH_PREFS_KEY_INSTALL_PARAMS = @"bnc_install_params";
 NSString * const BRANCH_PREFS_KEY_USER_URL = @"bnc_user_url";
-NSString * const BRANCH_PREFS_KEY_IS_REFERRABLE = @"bnc_is_referrable";
 NSString * const BRANCH_PREFS_KEY_BRANCH_UNIVERSAL_LINK_DOMAINS = @"branch_universal_link_domains";
 NSString * const BRANCH_REQUEST_KEY_EXTERNAL_INTENT_URI = @"external_intent_uri";
 
 NSString * const BRANCH_PREFS_KEY_CREDITS = @"bnc_credits";
 NSString * const BRANCH_PREFS_KEY_CREDIT_BASE = @"bnc_credit_base_";
 
-NSString * const BRANCH_PREFS_KEY_COUNTS = @"bnc_counts";
-NSString * const BRANCH_PREFS_KEY_TOTAL_BASE = @"bnc_total_base_";
-NSString * const BRANCH_PREFS_KEY_UNIQUE_BASE = @"bnc_unique_base_";
-
 NSString * const BRANCH_PREFS_KEY_BRANCH_VIEW_USAGE_CNT = @"bnc_branch_view_usage_cnt_";
 
 // The name of this key was specified in the account-creation API integration
@@ -52,7 +47,6 @@
 @interface BNCPreferenceHelper ()
 
 @property (strong, nonatomic) NSMutableDictionary *persistenceDict;
-@property (strong, nonatomic) NSMutableDictionary *countsDictionary;
 @property (strong, nonatomic) NSMutableDictionary *creditsDictionary;
 @property (strong, nonatomic) NSMutableDictionary *requestMetadataDictionary;
 @property (strong, nonatomic) NSMutableDictionary *instrumentationDictionary;
@@ -77,7 +71,6 @@ @implementation BNCPreferenceHelper
             installParams = _installParams,
             universalLinkUrl = _universalLinkUrl,
             externalIntentURI = _externalIntentURI,
-            isReferrable = _isReferrable,
             isDebug = _isDebug,
             shouldWaitForInit = _shouldWaitForInit,
             suppressWarningLogs = _suppressWarningLogs,
@@ -108,8 +101,6 @@ - (id)init {
 
         _isDebug = NO;
         _suppressWarningLogs = NO;
-        _explicitlyRequestedReferrable = NO;
-        _isReferrable = [self readBoolFromDefaults:BRANCH_PREFS_KEY_IS_REFERRABLE];
     }
 
     return self;
@@ -454,29 +445,8 @@ - (void)setCheckedFacebookAppLinks:(BOOL)checked {
     [self writeBoolToDefaults:BRANCH_PREFS_KEY_CHECKED_FACEBOOK_APP_LINKS value:checked];
 }
 
-- (BOOL)isReferrable {
-    BOOL hasIdentity = self.identityID != nil;
-    
-    // If referrable is set, but they already have an identity, they should only
-    // still be referrable if the dev has explicitly set always referrable.
-    if (_isReferrable && hasIdentity) {
-        return _explicitlyRequestedReferrable;
-    }
-    
-    // If not referrable, or no identity yet, whatever isReferrable has is fine to return.
-    return _isReferrable;
-}
-
-- (void)setIsReferrable:(BOOL)isReferrable {
-    if (_isReferrable != isReferrable) {
-        _isReferrable = isReferrable;
-        [self writeBoolToDefaults:BRANCH_PREFS_KEY_IS_REFERRABLE value:isReferrable];
-    }
-}
-
 - (void)clearUserCreditsAndCounts {
     self.creditsDictionary = [[NSMutableDictionary alloc] init];
-    self.countsDictionary = [[NSMutableDictionary alloc] init];
 }
 
 - (id)getBranchUniversalLinkDomains {
@@ -578,38 +548,6 @@ - (void)clearUserCredits {
 
 #pragma mark - Count Storage
 
-- (NSMutableDictionary *)countsDictionary {
-    if (!_countsDictionary) {
-        _countsDictionary = [[self readObjectFromDefaults:BRANCH_PREFS_KEY_COUNTS] mutableCopy];
-        
-        if (!_countsDictionary) {
-            _countsDictionary = [[NSMutableDictionary alloc] init];
-        }
-    }
-    
-    return _countsDictionary;
-}
-
-- (void)setActionTotalCount:(NSString *)action withCount:(NSInteger)count {
-    self.countsDictionary[[BRANCH_PREFS_KEY_TOTAL_BASE stringByAppendingString:action]] = @(count);
-    
-    [self writeObjectToDefaults:BRANCH_PREFS_KEY_COUNTS value:self.countsDictionary];
-}
-
-- (void)setActionUniqueCount:(NSString *)action withCount:(NSInteger)count {
-    self.countsDictionary[[BRANCH_PREFS_KEY_UNIQUE_BASE stringByAppendingString:action]] = @(count);
-
-    [self writeObjectToDefaults:BRANCH_PREFS_KEY_COUNTS value:self.countsDictionary];
-}
-
-- (NSInteger)getActionTotalCount:(NSString *)action {
-    return [self.countsDictionary[[BRANCH_PREFS_KEY_TOTAL_BASE stringByAppendingString:action]] integerValue];
-}
-
-- (NSInteger)getActionUniqueCount:(NSString *)action {
-    return [self.countsDictionary[[BRANCH_PREFS_KEY_UNIQUE_BASE stringByAppendingString:action]] integerValue];
-}
-
 - (void)updateBranchViewCount:(NSString *)branchViewID {
     NSInteger currentCount = [self getBranchViewCount:branchViewID] + 1;
     [self writeObjectToDefaults:[BRANCH_PREFS_KEY_BRANCH_VIEW_USAGE_CNT stringByAppendingString:branchViewID] value:@(currentCount)];

Branch-SDK/Branch-SDK/BNCServerInterface.h

@@ -12,11 +12,6 @@
 
 typedef void (^BNCServerCallback)(BNCServerResponse *response, NSError *error);
 
-static NSString *REQ_TAG_DEBUG_CONNECT = @"t_debug_connect";
-static NSString *REQ_TAG_DEBUG_LOG = @"t_debug_log";
-static NSString *REQ_TAG_DEBUG_SCREEN = @"t_debug_screen";
-static NSString *REQ_TAG_DEBUG_DISCONNECT = @"t_debug_disconnect";
-
 @interface BNCServerInterface : NSObject
 
 @property (strong, nonatomic) BNCPreferenceHelper *preferenceHelper;