Updated android

Author: nsingh-branch

src/android/io/branch/BranchSDK.java

@@ -228,6 +228,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
                     branchObjectWrappers.set(args.getInt(0), branchObjWrapper);
 
                 } else if (action.equals("getBranchQRCode")) {
+                      if (args.length() != 4) {
+                        callbackContext.error(String.format("Parameter mismatched. 4 is required but %d is given", args.length()));
+                        return false;
+                    }
                     cordova.getActivity().runOnUiThread(r);
                     return true; 
                 }
@@ -530,38 +534,43 @@ private void getBranchQRCode(JSONObject qrCodeSettings, int instanceIdx, JSONObj
         BranchUniversalObjectWrapper branchUniversalWrapper = (BranchUniversalObjectWrapper) this.branchObjectWrappers.get(instanceIdx);
         BranchUniversalObject buo = branchUniversalWrapper.branchUniversalObj;
 
-        BranchQRCode qrCode = new BranchQRCode();
-        //setCodeColor, setWidth, etc.
+        BranchQRCode branchQRCode = new BranchQRCode();
+        if (qrCodeSettings.has("codeColor")) branchQRCode.setCodeColor(qrCodeSettings.getString("codeColor"));
+        if (qrCodeSettings.has("backgroundColor")) branchQRCode.setBackgroundColor(qrCodeSettings.getString("backgroundColor"));
+        if (qrCodeSettings.has("centerLogo")) branchQRCode.setCenterLogo(qrCodeSettings.getString("centerLogo"));
+        if (qrCodeSettings.has("width")) branchQRCode.setWidth(qrCodeSettings.getInt("width"));
+        if (qrCodeSettings.has("margin")) branchQRCode.setMargin(qrCodeSettings.getInt("margin"));
+        if (qrCodeSettings.has("imageFormat")) {
+            String imageFormat = qrCodeSettings.getString("imageFormat");
+            if (imageFormat != null ) {
+                if (imageFormat.equals("JPEG")) {
+                    branchQRCode.setImageFormat(BranchQRCode.BranchImageFormat.JPEG);
+                } else {
+                    branchQRCode.setImageFormat(BranchQRCode.BranchImageFormat.PNG);
+                }
+            }
+        }
 
         try {
-            qrCode.getQRCodeAsData(this.activity, buo, linkProperties, new GetBranchQRCodeListener(callbackContext));
+            branchQRCode.getQRCodeAsData(this.activity, buo, linkProperties, new BranchQRCode.BranchQRCodeDataHandler() {
+                @Override
+                public void onSuccess(byte[] qrCodeData) {
+                    String qrCodeString = Base64.encodeToString(qrCodeData, Base64.DEFAULT);
+                    Log.d(LCAT, qrCodeString);
+                    callbackContext.success(qrCodeString);
+                }
+    
+                @Override
+                public void onFailure(Exception e) {
+                    Log.d(LCAT, e.getMessage());
+                    callbackContext.error(e.getMessage());
+                }    
+            });
         } catch (IOException e) {
             e.printStackTrace();
-            Log.d("Failed to get QR Code", e.getMessage());
+            Log.d(LCAT, e.getMessage());
+            callbackContext.error(e.getMessage());
         }
-
-        //try {
-        //     qrCode.getQRCodeAsData(this.activity, branchUniversalObject, linkProperties, new GetBranchQRCodeListener(callbackContext)) {
-        //         @Override
-        //         public void onSuccess(byte[] qrCodeData) {
-        //             String qrCodeString = Base64.encodeToString(qrCodeData, Base64.DEFAULT);
-        //             promise.resolve(qrCodeString);
-        //         }
-    
-        //         @Override
-        //         public void onFailure(Exception e) {
-        //             Log.d("Failed to get QR Code", e.getMessage());
-        //             promise.reject("Failed to get QR Code", e.getMessage());
-        //         }    
-        //         });
-        // } catch (IOException e) {
-        //     e.printStackTrace();
-        //     Log.d("Failed to get QR Code", e.getMessage());
-        //     promise.reject("Failed to get QR Code", e.getMessage());
-        // }
-
-        //branchUniversalWrapper.branchUniversalObj.generateShortUrl(this.activity, linkProperties, new GenerateShortUrlListener(callbackContext));
-
     }
 
     /**
@@ -1073,39 +1082,7 @@ public void onLinkCreate(String url, BranchError error) {
         }
 
     }
-
-    protected class GetBranchQRCodeListener implements BranchQRCode.BranchQRCodeDataHandler {
-        private CallbackContext _callbackContext;
-
-        // Constructor that takes in a required callbackContext object
-        public GetBranchQRCodeListener(CallbackContext callbackContext) {
-
-            this._callbackContext = callbackContext;
-
-        }
-
-        @Override
-        public void onSuccess(byte[] qrCodeData) {
-
-            String qrCodeString = Base64.encodeToString(qrCodeData, Base64.DEFAULT);
-
-            String response = qrCodeString;
-         
-            Log.d(LCAT, response);
-            this._callbackContext.success(response);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-                
-            String errorMessage = String.valueOf(e);
-
-            Log.d(LCAT, errorMessage);
-            this._callbackContext.error(errorMessage);
-        }
-
-    }
-
+    
     protected class ShowShareSheetListener implements Branch.BranchLinkShareListener {
 
         private CallbackContext _onShareLinkDialogLaunched;

src/ios/BranchSDK.m

@@ -653,9 +653,8 @@ - (void)getBranchQRCode:(CDVInvokedUrlCommand*)command
     int branchUniversalObjectId = [[command.arguments objectAtIndex:1] intValue];
     NSMutableDictionary *branchUniversalObjDict = [self.branchUniversalObjArray objectAtIndex:branchUniversalObjectId];
     BranchUniversalObject *branchUniversalObj = [branchUniversalObjDict objectForKey:@"branchUniversalObj"];
-      //BranchUniversalObject *branchUniversalObj = [BranchUniversalObject new];//[[BranchUniversalObject alloc] initWithMap:universalObjectProperties];
 
-    BranchLinkProperties *linkProperties = [BranchLinkProperties new];//[self createLinkProperties:linkPropertiesMap withControlParams:controlParamsMap];
+    BranchLinkProperties *linkProperties = [BranchLinkProperties new];
 
     NSDictionary *arg1 = [command.arguments objectAtIndex:2];
     NSDictionary *arg2 = [command.arguments objectAtIndex:3];
@@ -689,7 +688,6 @@ - (void)getBranchQRCode:(CDVInvokedUrlCommand*)command
       }
     }
 
-
     NSMutableDictionary *qrCodeSettingsMap = [command.arguments objectAtIndex:0];
 
     BranchQRCode *qrCode = [BranchQRCode new];
@@ -722,10 +720,8 @@ - (void)getBranchQRCode:(CDVInvokedUrlCommand*)command
 
         if (!error) {
             NSString* imageString = [qrCodeData base64EncodedStringWithOptions:nil];
-            NSLog(@"Success");
             pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:imageString];
         } else {
-            NSLog(@"Error");
             pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[error localizedDescription]];
         }