Merge pull request #255 from BranchMetrics/249

ethanneff · web-flow · commit e564f1c5d203 · 2016-12-08T12:26:41.000-08:00
249
diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -75,7 +75,7 @@ gulp prerelease && cd testbed && npm install -g cordova && cordova platform remo
 > Validate all features on both `iOS` and `Android` on `device` only (no `simulator` or `TestFlight`)
 
 ```sh
-cordova build ios && open -a Xcode platforms/ios/Branch\ Testing.xcworkspace;
+cordova build ios --developmentTeam="PW4Q8885U7" --device;
 ```
 
 ```sh
diff --git a/src/android/io/branch/BranchSDK.java b/src/android/io/branch/BranchSDK.java
@@ -459,6 +459,9 @@ private BranchLinkProperties createLinkProperties(JSONObject options, JSONObject
         if (options.has("stage")) {
             linkProperties.setStage(options.getString("stage"));
         }
+        if (options.has("campaign")) {
+            linkProperties.setCampaign(options.getString("campaign"));
+        }
         if (options.has("duration")) {
             linkProperties.setDuration(options.getInt("duration"));
         }
diff --git a/src/ios/BranchSDK.m b/src/ios/BranchSDK.m
@@ -454,6 +454,9 @@ - (void)generateShortUrl:(CDVInvokedUrlCommand*)command
         else if ([key isEqualToString:@"stage"]) {
             props.stage = [arg1 objectForKey:key];
         }
+        else if ([key isEqualToString:@"campaign"]) {
+            props.campaign = [arg1 objectForKey:key];
+        }
         else if ([key isEqualToString:@"alias"]) {
             props.alias = [arg1 objectForKey:key];
         }
diff --git a/testbed/www/js.es6/index.js b/testbed/www/js.es6/index.js
@@ -182,7 +182,8 @@ function BranchDeepLink() {
     $ipad_url: "http://www.example.com/ipad",
     more_custom: "data",
     even_more_custom: true,
-    this_is_custom: 41231
+    this_is_custom: 41231,
+    this_is_date: Date.now()
   };
 
   // needs a universal object
diff --git a/testbed/www/js/index.js b/testbed/www/js/index.js
@@ -184,7 +184,8 @@ function BranchDeepLink() {
     $ipad_url: "http://www.example.com/ipad",
     more_custom: "data",
     even_more_custom: true,
-    this_is_custom: 41231
+    this_is_custom: 41231,
+    this_is_date: Date.now()
   };
 
   // needs a universal object
diff --git a/www.es6/branch.js b/www.es6/branch.js
@@ -292,6 +292,7 @@ Branch.prototype.createBranchUniversalObject = function(options) {
              *    |  feature  |   String   |   The link feature    |
              *    |   alias   |   String   |    The link alias     |
              *    |  channel  |   String   |   The link channel    |
+             *    |  campaign |   String   |   The link campaign   |
              *    |   stage   |   String   |    The link stage     |
              *    |  duration |    Int     |   The link duration   |
              *    --------------------------------------------------
@@ -332,6 +333,7 @@ Branch.prototype.createBranchUniversalObject = function(options) {
              *    |  feature  |   String   |   The link feature    |
              *    |   alias   |   String   |    The link alias     |
              *    |  channel  |   String   |   The link channel    |
+             *    |  campaign |   String   |   The link campaign   |
              *    |   stage   |   String   |    The link stage     |
              *    |  duration |    Int     |   The link duration   |
              *    --------------------------------------------------
diff --git a/www/branch.js b/www/branch.js
@@ -274,6 +274,7 @@ Branch.prototype.createBranchUniversalObject = function (options) {
              *    |  feature  |   String   |   The link feature    |
              *    |   alias   |   String   |    The link alias     |
              *    |  channel  |   String   |   The link channel    |
+             *    |  campaign |   String   |   The link campaign   |
              *    |   stage   |   String   |    The link stage     |
              *    |  duration |    Int     |   The link duration   |
              *    --------------------------------------------------
@@ -313,6 +314,7 @@ Branch.prototype.createBranchUniversalObject = function (options) {
              *    |  feature  |   String   |   The link feature    |
              *    |   alias   |   String   |    The link alias     |
              *    |  channel  |   String   |   The link channel    |
+             *    |  campaign |   String   |   The link campaign   |
              *    |   stage   |   String   |    The link stage     |
              *    |  duration |    Int     |   The link duration   |
              *    --------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,9 @@ private BranchLinkProperties createLinkProperties(JSONObject options, JSONObject`
`459`	`459`	`if (options.has("stage")) {`
`460`	`460`	`linkProperties.setStage(options.getString("stage"));`
`461`	`461`	`}`
	`462`	`+ if (options.has("campaign")) {`
	`463`	`+ linkProperties.setCampaign(options.getString("campaign"));`
	`464`	`+ }`
`462`	`465`	`if (options.has("duration")) {`
`463`	`466`	`linkProperties.setDuration(options.getInt("duration"));`
`464`	`467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -454,6 +454,9 @@ - (void)generateShortUrl:(CDVInvokedUrlCommand*)command`
`454`	`454`	`else if ([key isEqualToString:@"stage"]) {`
`455`	`455`	`props.stage = [arg1 objectForKey:key];`
`456`	`456`	`}`
	`457`	`+ else if ([key isEqualToString:@"campaign"]) {`
	`458`	`+ props.campaign = [arg1 objectForKey:key];`
	`459`	`+ }`
`457`	`460`	`else if ([key isEqualToString:@"alias"]) {`
`458`	`461`	`props.alias = [arg1 objectForKey:key];`
`459`	`462`	`}`