Merge branch 'master' into staging

Author: sojanpr

Branch-TestBed-Swift/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - Branch (0.12.9):
-    - Branch/Core (= 0.12.9)
-    - Branch/without-IDFA (= 0.12.9)
-  - Branch/Core (0.12.9)
-  - Branch/without-IDFA (0.12.9)
+  - Branch (0.12.10):
+    - Branch/Core (= 0.12.10)
+    - Branch/without-IDFA (= 0.12.10)
+  - Branch/Core (0.12.10)
+  - Branch/without-IDFA (0.12.10)
 
 DEPENDENCIES:
   - Branch
 
 SPEC CHECKSUMS:
-  Branch: 339863b49859de1a64f1b785afe6ad8770a0e7d3
+  Branch: 371ebad8c506e7a808db8d7840108d3de3007c1e
 
 PODFILE CHECKSUM: b8eaac19532c4179c1c4ce62932a85facd7ac4b7
 
-COCOAPODS: 1.0.0
+COCOAPODS: 1.0.1

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

@@ -178,10 +178,10 @@ class ViewController: UITableViewController {
 
         print(universalObjectProperties["$canonical_identifier"])
         if let canonicalIdentifier = universalObjectProperties["$canonical_identifier"] as? String {
-            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: canonicalIdentifier)!
+            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: canonicalIdentifier)
         } else {
             print(universalObjectProperties["$canonical_identifier"])
-            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: "_")!
+            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: "_")
         }
 
         for key in universalObjectProperties.keys {
@@ -239,17 +239,18 @@ class ViewController: UITableViewController {
 
         print(universalObjectProperties["$canonical_identifier"])
         if let canonicalIdentifier = universalObjectProperties["$canonical_identifier"] as? String {
-            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: canonicalIdentifier)!
+            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: canonicalIdentifier)
         } else {
             print(universalObjectProperties["$canonical_identifier"])
-            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: "_")!
+            branchUniversalObject = BranchUniversalObject.init(canonicalIdentifier: "_")
         }
 
         for key in universalObjectProperties.keys {
             setBranchUniversalObjectProperty(key)
         }
 
-        branchUniversalObject.getShortUrl(with: branchLinkProperties) { (url, error) in
+        //branchUniversalObject.getShortUrl(with: branchLinkProperties) { (url, error) in
+        branchUniversalObject.getShortUrl(with: branchLinkProperties,  andCallback: { (url: String, error: Error?) in
             if (error == nil) {
                 print(self.branchLinkProperties.description())
                 print(self.branchUniversalObject.description())
@@ -260,7 +261,7 @@ class ViewController: UITableViewController {
                 self.showAlert("Link Creation Failed", withDescription: error!.localizedDescription)
             }
 
-        }
+        })
     }
 
     @IBAction func redeemPointsButtonTouchUpInside(_ sender: AnyObject) {

Branch-TestBed-Swift/TestBed-Swift/ViewController.swift

@@ -1072,6 +1072,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Branch-TestBed/Branch-TestBed.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = R63EM248DP;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Branch-TestBed/Branch-TestBed-Prefix.pch";
 				INFOPLIST_FILE = "Branch-TestBed/Branch-TestBed-Info.plist";
@@ -1093,6 +1094,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Branch-TestBed/Branch-TestBed.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = R63EM248DP;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Branch-TestBed/Branch-TestBed-Prefix.pch";
 				INFOPLIST_FILE = "Branch-TestBed/Branch-TestBed-Info.plist";

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

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -54,6 +64,16 @@
       "filename" : "icon180x180.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",

Branch-TestBed/Branch-TestBed/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -56,5 +56,11 @@
 	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <!--Include to allow all connections (DANGER)-->
+        <key>NSAllowsArbitraryLoads</key>
+        <true/>
+    </dict>
 </dict>
 </plist>

Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist

@@ -640,7 +640,7 @@ linkProperties.addControlParam("$ios_url", withValue: "http://example.com/ios")
 ```
 
 ```swift
-branchUniversalObject.getShortUrlWithLinkProperties(linkProperties,  andCallback: { (url: String?, error: NSError?) -> Void in
+branchUniversalObject.getShortUrl(with: linkProperties,  andCallback: { (url: String, error: Error?) in
     if error == nil {
         NSLog("got my Branch link to share: %@", url)
     }