Fixed searchAd debug mode. Version 0.19.4.

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.19.3";
+NSString * const BNC_SDK_VERSION     = @"0.19.4";

Branch-SDK/Branch-SDK/BNCDeviceInfo.h

@@ -27,7 +27,7 @@
 @property (atomic, copy, readonly) NSString* language;           //!< The iso2 language code (en, ml).
 @property (atomic, copy, readonly) NSString* browserUserAgent;   //!< Simple user agent string.
 @property (atomic, copy, readonly) NSString* localIPAddress;     //!< The current local IP address.
-
+@property (atomic, copy, readonly) NSArray<NSString*> *allIPAddresses; //!< All local IP addresses.
 //----------Methods----------------//
 + (BNCDeviceInfo *)getInstance;
 + (NSString*) userAgentString;          // Warning:  Has an implied lock on main thread on first call.

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -19,7 +19,7 @@
 #import <arpa/inet.h>
 #import <netinet/in.h>
 
-#pragma mark - BRNNetworkInfo
+#pragma mark BRNNetworkInfo
 
 typedef NS_ENUM(NSInteger, BNCNetworkAddressType) {
     BNCNetworkAddressTypeUnknown = 0,
@@ -58,9 +58,15 @@ @implementation BNCNetworkInterface
         // BNCLogDebugSDK(@"Found %s: %x.", interface->ifa_name, interface->ifa_flags);
 
         // Check the state: IFF_RUNNING, IFF_UP, IFF_LOOPBACK, etc.
-		if (!(interface->ifa_flags & IFF_RUNNING) ||
-             (interface->ifa_flags & IFF_LOOPBACK))
-			continue;
+        if ((interface->ifa_flags & IFF_UP) &&
+            (interface->ifa_flags & IFF_RUNNING) &&
+            !(interface->ifa_flags & IFF_LOOPBACK)) {
+        } else {
+            continue;
+        }
+
+        // TODO: Check ifdata too.
+        // struct if_data *ifdata = interface->ifa_data;
 
 		const struct sockaddr_in *addr = (const struct sockaddr_in*)interface->ifa_addr;
 		if (!addr) continue;
@@ -189,6 +195,14 @@ - (NSString*) localIPAddress { // For 'local_ip' server field.
     }
 }
 
+- (NSArray<NSString*>*) allIPAddresses {
+    NSMutableArray *array = [NSMutableArray new];
+    for (BNCNetworkInterface *inf in [BNCNetworkInterface currentInterfaces]) {
+        [array addObject:inf.description];
+    }
+    return array;
+}
+
 + (NSString*) bnc_country {
 
     NSString *country = nil;

Branch-SDK/Branch-SDK/Branch.m

@@ -811,8 +811,8 @@ - (BOOL)checkAppleSearchAdsAttribution {
         // If searchAdsDebugMode is on then force the result to a set value for testing:
         if (self.searchAdsDebugMode) {
             // Round down to one day for testing.
-            NSTimeInterval const kOneDay = (60.0*60.0*24.0);
-            NSTimeInterval t = trunc([[NSDate date] timeIntervalSince1970] / kOneDay) * kOneDay;
+            NSTimeInterval const kOneHour = (60.0*60.0*1.0);
+            NSTimeInterval t = trunc([[NSDate date] timeIntervalSince1970] / kOneHour) * kOneHour;
             NSDate *date = [NSDate dateWithTimeIntervalSince1970:t];
 
             attrDetails = @{

Branch-TestBed/Branch-TestBed-UITests/UITestBed/TBAppDelegate.m

@@ -20,7 +20,8 @@ @implementation TBAppDelegate
 
 - (BOOL)application:(UIApplication *)application
 didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
+    BNCLogSetDisplayLevel(BNCLogLevelAll);
+    
     [self initializeViewControllers];
 
     // Initialize Branch

Branch-TestBed/Branch-TestBed-UITests/UITestBed/TBBranchViewController.m

@@ -274,6 +274,7 @@ - (IBAction) sendCommerceEvent:(id)sender {
 }
 
 - (IBAction)showLocalIPAddress:(id)sender {
+    BNCLogDebugSDK(@"All IP Addresses:\n%@\n.", [BNCDeviceInfo getInstance].allIPAddresses);
     NSString *lip = [BNCDeviceInfo getInstance].localIPAddress;
     if (!lip) lip = @"<nil>";
     if (lip.length == 0) lip = @"<empty string>";

Branch-TestBed/Framework-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.19.3</string>
+	<string>0.19.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.19.3</string>
+	<string>0.19.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

Branch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.19.3"
+  s.version          = "0.19.4"
   s.summary          = "Create an HTTP URL for any piece of content in your app"
   s.description      = <<-DESC
 - Want the highest possible conversions on your sharing feature?

carthage-files/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.19.3</string>
+	<string>0.19.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.19.3</string>
+	<string>0.19.4</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

scripts/version

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.19.3
+version=0.19.4
 
 if (( $# == 0 )); then
     echo $version