Params bugfixes

Params bugfixes

Author: rob-gioia-branch

Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java

@@ -117,14 +117,10 @@ void LoadStep2Screen() {
             case CANONICAL_URL:
                 linkingValidatorEditText.setVisibility(View.VISIBLE);
                 linkingValidatorText.setText(LinkingValidatorConstants.canonicalURLPromptText);
-                routingKey = LinkingValidatorConstants.canonicalUrlKey;
-                routingValue = linkingValidatorEditText.getText().toString();
                 break;
             case DEEPLINK_PATH:
                 linkingValidatorEditText.setVisibility(View.VISIBLE);
                 linkingValidatorText.setText(LinkingValidatorConstants.deeplinkPathPromptText);
-                routingKey = LinkingValidatorConstants.deeplinkPathKey;
-                routingValue = linkingValidatorEditText.getText().toString();
                 break;
             case CUSTOM:
                 customKVPField.setVisibility(View.VISIBLE);
@@ -134,6 +130,17 @@ void LoadStep2Screen() {
     }
 
     void GenerateBranchLinks() {
+        switch(routingType) {
+            case CANONICAL_URL:
+                routingKey = LinkingValidatorConstants.canonicalUrlKey;
+                routingValue = linkingValidatorEditText.getText().toString();
+                break;
+            case DEEPLINK_PATH:
+                routingKey = LinkingValidatorConstants.deeplinkPathKey;
+                routingValue = linkingValidatorEditText.getText().toString();
+                break;
+        }
+
         step++;
         linkingValidatorEditText.setVisibility(View.GONE);
         customKVPField.setVisibility(View.GONE);

Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java

@@ -68,6 +68,8 @@ public void InitializeRow(String title, String infoText, String debugText, Strin
             linkDataParams.put(params[i], params[i + 1]);
         }
 
+        linkDataParams.put(routingKey, routingValue);
+
         infoButton.setOnClickListener(view1 -> {
             HandleInfoButtonClicked();
         });
@@ -140,6 +142,10 @@ private void HandleWarmStartClick() {
     private void HandleForegroundLinkClick() {
         BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(canonicalIdentifier);
         LinkProperties lp = new LinkProperties();
+        lp.addControlParameter(routingKey, routingValue);
+        for (int i = 0; i < linkDataParams.size(); i += 2) {
+            lp.addControlParameter(linkDataParams.get(i), linkDataParams.get(i + 1));
+        }
         String branchLink = buo.getShortUrl(context, lp);
         Intent intent = new Intent(getContext(), getActivity(context).getClass());
         intent.putExtra("branch", branchLink);