Merge pull request #24 from BranchMetrics/setdebug-update

Setdebug update

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "Web-SDK"]
 	path = Web-SDK
-	url = git@github.com:BranchMetrics/Web-SDK.git
+	url = git@github.com:BranchMetrics/Smart-App-Banner-Deep-Linking-Web-SDK.git

cordova-src/android/BranchDevice.java

@@ -83,10 +83,11 @@ private void getInstallData(JSONArray args, CallbackContext callbackContext) {
 		JSONObject installPost = new JSONObject();
 		try {
 			boolean debug = args.optBoolean(0);
-			Log.d("BranchDevice", "GetInstallData debug value is " + debug);
+			Log.d("BranchDevice", "getInstallData debug value is " + debug);
 			int isReferrable = args.optInt(1, -1);
-			Log.d("BranchDevice", "GetInstallData isReferrable value is " + isReferrable);
+			Log.d("BranchDevice", "getInstallData isReferrable value is " + isReferrable);
 			String idStr = getUniqueID(debug);
+			installPost.put("debug_set", debug);
 			if (!idStr.equals(BLANK)) {
 				installPost.put("hardware_id", idStr);
 				installPost.put("is_hardware_id_real", hasRealHardwareId());
@@ -138,7 +139,7 @@ private void getOpenData(JSONArray args, CallbackContext callbackContext) {
 		JSONObject openPost = new JSONObject();
 		try {
 			int isReferrable = args.optInt(0, -1);
-			Log.d("BranchDevice", "GetInstallData isReferrable value is " + isReferrable);
+			Log.d("BranchDevice", "getOpenData isReferrable value is " + isReferrable);
 			if (isReferrable < 0) {
 				openPost.put("is_referrable", 0);
 			} else {

cordova-src/ios/BNCDevice.m

@@ -42,11 +42,12 @@ - (NSDictionary*)parseURLParams:(NSString *)query {
 
 - (void)getInstallData:(CDVInvokedUrlCommand *)command {
     BOOL debug = [[command argumentAtIndex:0 withDefault:[NSNumber numberWithBool:NO]] boolValue];
-    int isReferrable = [[command argumentAtIndex:0 withDefault:[NSNumber numberWithInt:-1]] intValue];
+    int isReferrable = [[command argumentAtIndex:1 withDefault:[NSNumber numberWithInt:-1]] intValue];
 
     NSMutableDictionary *post = [[NSMutableDictionary alloc] init];
     BOOL isRealHardwareId;
     NSString *hardwareId = [BNCDevice getUniqueHardwareId:&isRealHardwareId andIsDebug:debug];
+    [post setObject:[NSNumber numberWithBool:debug] forKey:@"debug_set"];
     if (hardwareId) {
         [post setObject:hardwareId forKey:@"hardware_id"];
         [post setObject:[NSNumber numberWithBool:isRealHardwareId] forKey:@"is_hardware_id_real"];
@@ -125,7 +126,7 @@ + (NSString *)getUniqueHardwareId:(BOOL *)isReal andIsDebug:(BOOL)debug {
         uid = [[UIDevice currentDevice].identifierForVendor UUIDString];
     }
 
-    if (!uid) {
+    if (!uid || debug) {
         uid = [[NSUUID UUID] UUIDString];
         *isReal = NO;
     }

cordova-testbed/init.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
 cordova plugin add org.apache.cordova.console de.appplant.cordova.plugin.email-composer
+# This fixes 404 errors in ajax calls on the android platform with newer versions of Cordova
+cordova plugin add cordova-plugin-whitelist
 cordova plugin add ../ --link
 cordova platform add ios android