From 2b798cdde52f7027dca20a18d8037f0ef8f98e09 Mon Sep 17 00:00:00 2001
From: Nipun Singh <88689850+nsingh-branch@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:51:20 -0700
Subject: [PATCH 01/14] [SDK-2487] Reverted minimum sdk version change (#1224)

Reverted minimum sdk version change
---
 ChangeLog.md      | 4 ++++
 gradle.properties | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index e658d83b1..3f68bf528 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,8 @@
 # Branch Android SDK change log
+- v5.12.4
+  * _*Master Release*_ - Sep 30, 2024
+  - Reverted the minimum SDK build version back to 21
+  
 - v5.12.3
   * _*Master Release*_ - Sep 25, 2024
   - Fix to properly fetch install referrers when using deferred init in plugins
diff --git a/gradle.properties b/gradle.properties
index 24c90d5e2..539df2579 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=5.12.3
-VERSION_CODE=051403
+VERSION_NAME=5.12.4
+VERSION_CODE=051404
 GROUP=io.branch.sdk.android
 
 POM_DESCRIPTION=Use the Branch SDK (branch.io) to create and power the links that point back to your apps for all of these things and more. Branch makes it incredibly simple to create powerful deep links that can pass data across app install and open while handling all edge cases (using on desktop vs. mobile vs. already having the app installed, etc). Best of all, it is really simple to start using the links for your own app: only 2 lines of code to register the deep link router and one more line of code to create the links with custom data.
@@ -13,7 +13,7 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=branch
 POM_DEVELOPER_NAME=Branch Metrics
 
-ANDROID_BUILD_SDK_VERSION_MINIMUM=23
+ANDROID_BUILD_SDK_VERSION_MINIMUM=21
 ANDROID_BUILD_SDK_VERSION_COMPILE=34
 ANDROID_BUILD_TOOLS_VERSION=34.0.0
 android.useAndroidX=true

From 9c1fa9e65ab2986cfabdeca4e5cfa705f5e0267d Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Wed, 9 Oct 2024 16:28:15 -0400
Subject: [PATCH 02/14] Got deep link validator dialog showing

Got deep link validator dialog showing
---
 .../branchandroidtestbed/MainActivity.java    |   2 +
 Branch-SDK/build.gradle.kts                   |   1 +
 .../referral/validators/LinkingValidator.java |  30 +++++++
 .../validators/LinkingValidatorDialog.java    |  15 ++++
 .../src/main/res/drawable/branch_icon.png     | Bin 0 -> 25058 bytes
 .../res/layout/dialog_linking_validator.xml   |  78 ++++++++++++++++++
 6 files changed, 126 insertions(+)
 create mode 100644 Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
 create mode 100644 Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
 create mode 100644 Branch-SDK/src/main/res/drawable/branch_icon.png
 create mode 100644 Branch-SDK/src/main/res/layout/dialog_linking_validator.xml

diff --git a/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java b/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java
index cc7d1a4d2..7fb5209ac 100644
--- a/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java
+++ b/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java
@@ -55,6 +55,7 @@
 import io.branch.referral.util.LinkProperties;
 import io.branch.referral.util.ProductCategory;
 import io.branch.referral.util.ShareSheetStyle;
+import io.branch.referral.validators.LinkingValidator;
 
 public class MainActivity extends Activity {
     private EditText txtShortUrl;
@@ -661,6 +662,7 @@ protected void onStart() {
         // IMP : Do not make this call in your production app
 
         //IntegrationValidator.validate(MainActivity.this);
+        LinkingValidator.validate(MainActivity.this);
     }
 
 
diff --git a/Branch-SDK/build.gradle.kts b/Branch-SDK/build.gradle.kts
index 1040ccbb8..5d03b308f 100644
--- a/Branch-SDK/build.gradle.kts
+++ b/Branch-SDK/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation("androidx.annotation:annotation:1.4.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
     // --- optional dependencies -----
     // Please note that the Branch SDK does not require any of the below optional dependencies to operate.
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
new file mode 100644
index 000000000..7c122ef4c
--- /dev/null
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
@@ -0,0 +1,30 @@
+package io.branch.referral.validators;
+
+import android.content.Context;
+import android.view.WindowManager;
+
+import java.util.Objects;
+
+public class LinkingValidator {
+    private static LinkingValidator instance;
+    private LinkingValidatorDialog linkingValidatorDialog;
+
+    private LinkingValidator(Context context) { }
+
+    public static void validate(Context context) {
+        if (instance == null) {
+            instance = new LinkingValidator(context);
+        }
+        instance.linkingValidatorDialog = new LinkingValidatorDialog(context);
+        instance.validateDeepLinkRouting(context);
+    }
+
+    private void validateDeepLinkRouting(Context context) {
+        WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
+        lp.copyFrom(Objects.requireNonNull(instance.linkingValidatorDialog.getWindow()).getAttributes());
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = 1000;
+        instance.linkingValidatorDialog.show();
+        instance.linkingValidatorDialog.getWindow().setAttributes(lp);
+    }
+}
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
new file mode 100644
index 000000000..a65ca1da4
--- /dev/null
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -0,0 +1,15 @@
+package io.branch.referral.validators;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Window;
+import io.branch.referral.R;
+
+public class LinkingValidatorDialog extends Dialog {
+
+    public LinkingValidatorDialog(final Context context) {
+        super(context);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        this.setContentView(R.layout.dialog_linking_validator);
+    }
+}
diff --git a/Branch-SDK/src/main/res/drawable/branch_icon.png b/Branch-SDK/src/main/res/drawable/branch_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..195fa54215822779cbaeac75c70940730f3d4d03
GIT binary patch
literal 25058
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

literal 0
HcmV?d00001

diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
new file mode 100644
index 000000000..06c3e5a7d
--- /dev/null
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF">
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="409dp"
+        android:layout_height="100dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.1" />
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:layout_weight="0.15"
+            android:src="@drawable/branch_icon" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.65"
+            android:gravity="center"
+            android:text="Branch Deep Link Validator"
+            android:textSize="20sp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.1" />
+    </LinearLayout>
+
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="351dp"
+        android:layout_height="50dp"
+        app:layout_constraintBottom_toTopOf="@+id/button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView2" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="312dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:gravity="center"
+        android:text="What key do you use for deep link routing?"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp"
+        android:background="#377FEB"
+        android:text="Next"
+        android:textColor="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e0a0ce08d0694f1851e81d9d810c23f079a65b1d Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Wed, 9 Oct 2024 16:45:05 -0400
Subject: [PATCH 03/14] Added spinner with the different choices of deep link
 keys used for routing

Added spinner with the different choices of deep link keys used for routing
---
 .../validators/LinkingValidatorDialog.java    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index a65ca1da4..146822e29 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -2,14 +2,41 @@
 
 import android.app.Dialog;
 import android.content.Context;
+import android.view.View;
 import android.view.Window;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import io.branch.referral.R;
 
-public class LinkingValidatorDialog extends Dialog {
+public class LinkingValidatorDialog extends Dialog implements AdapterView.OnItemSelectedListener {
 
     public LinkingValidatorDialog(final Context context) {
         super(context);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         this.setContentView(R.layout.dialog_linking_validator);
+
+        Spinner spinner = findViewById(R.id.spinner);
+        List<String> choices = new ArrayList<>();
+        choices.add("$canonical_url");
+        choices.add("$deeplink_path");
+        choices.add("other (custom)");
+        ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, choices);
+        dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinner.setAdapter(dataAdapter);
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> adapterView) {
+
     }
 }

From 0dfcb5928e23a4b1a994f7e149c7a6bb5c3ac40f Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 11 Oct 2024 15:53:21 -0400
Subject: [PATCH 04/14] Next button loads the correct content for step 2 based
 on the user's choice

Next button loads the correct content for step 2 based on the user's choice
---
 .../referral/validators/LinkingValidator.java |  4 +-
 .../validators/LinkingValidatorConstants.java |  9 +++
 .../validators/LinkingValidatorDialog.java    | 75 +++++++++++++++++-
 .../res/layout/dialog_linking_validator.xml   | 77 ++++++++++++++++---
 4 files changed, 152 insertions(+), 13 deletions(-)
 create mode 100644 Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
index 7c122ef4c..2161ea2e6 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.view.WindowManager;
+import android.widget.Button;
 
 import java.util.Objects;
 
@@ -9,7 +10,7 @@ public class LinkingValidator {
     private static LinkingValidator instance;
     private LinkingValidatorDialog linkingValidatorDialog;
 
-    private LinkingValidator(Context context) { }
+    private LinkingValidator(Context context) {}
 
     public static void validate(Context context) {
         if (instance == null) {
@@ -26,5 +27,6 @@ private void validateDeepLinkRouting(Context context) {
         lp.height = 1000;
         instance.linkingValidatorDialog.show();
         instance.linkingValidatorDialog.getWindow().setAttributes(lp);
+
     }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
new file mode 100644
index 000000000..7b53dbbe2
--- /dev/null
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
@@ -0,0 +1,9 @@
+package io.branch.referral.validators;
+
+public class LinkingValidatorConstants {
+        public static final String canonicalURLPromptText = "Please paste in a web link for the $canonical_url";
+        public static final String deeplinkPathPromptText = "Please paste in a value for the $deeplink_path";
+        public static final String customKeyPromptText = "Please enter your custom key and value for routing";
+        public static final String step1ButtonText = "Next";
+        public static final String step2ButtonText = "  Generate Links for Testing  ";
+}
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 146822e29..1ca87b638 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -6,7 +6,11 @@
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,28 +19,93 @@
 
 public class LinkingValidatorDialog extends Dialog implements AdapterView.OnItemSelectedListener {
 
+    private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
+    private ROUTING_TYPE routingType;
+    private Button ctaButton;
+    private Spinner linkingValidatorDropdownMenu;
+    private TextView linkingValidatorText;
+    private EditText linkingValidatorEditText;
+    private LinearLayout customKVPField;
+    private int step = 1;
+
     public LinkingValidatorDialog(final Context context) {
         super(context);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         this.setContentView(R.layout.dialog_linking_validator);
 
-        Spinner spinner = findViewById(R.id.spinner);
+        linkingValidatorDropdownMenu = findViewById(R.id.linkingValidatorDropdownMenu);
         List<String> choices = new ArrayList<>();
         choices.add("$canonical_url");
         choices.add("$deeplink_path");
         choices.add("other (custom)");
         ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, choices);
         dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(dataAdapter);
+        linkingValidatorDropdownMenu.setAdapter(dataAdapter);
+        linkingValidatorDropdownMenu.setOnItemSelectedListener(this);
+
+        ctaButton = findViewById(R.id.linkingValidatorButton);
+        ctaButton.setText(LinkingValidatorConstants.step1ButtonText);
+        ctaButton.setOnClickListener(view -> {
+            if(step == 1) {
+                LoadStep2Screen();
+            } else {
+                GenerateBranchLinks();
+            }
+        });
+
+        linkingValidatorText = findViewById(R.id.linkingValidatorText);
+        linkingValidatorEditText = findViewById(R.id.linkingValidatorEditText);
+        customKVPField = findViewById(R.id.customKVPField);
+
+        linkingValidatorEditText.setVisibility(View.GONE);
+        customKVPField.setVisibility(View.GONE);
+
+        routingType = ROUTING_TYPE.CANONICAL_URL;
     }
 
     @Override
     public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-
+        String item = adapterView.getItemAtPosition(i).toString();
+        switch (item) {
+            case "$canonical_url":
+                routingType = ROUTING_TYPE.CANONICAL_URL;
+                break;
+            case "$deeplink_path":
+                routingType = ROUTING_TYPE.DEEPLINK_PATH;
+                break;
+            case "other (custom)":
+                routingType = ROUTING_TYPE.CUSTOM;
+                break;
+        }
     }
 
     @Override
     public void onNothingSelected(AdapterView<?> adapterView) {
 
     }
+
+    void LoadStep2Screen() {
+        step++;
+        ctaButton.setText(LinkingValidatorConstants.step2ButtonText);
+        linkingValidatorDropdownMenu.setVisibility(View.GONE);
+
+        switch(routingType) {
+            case CANONICAL_URL:
+                linkingValidatorEditText.setVisibility(View.VISIBLE);
+                linkingValidatorText.setText(LinkingValidatorConstants.canonicalURLPromptText);
+                break;
+            case DEEPLINK_PATH:
+                linkingValidatorEditText.setVisibility(View.VISIBLE);
+                linkingValidatorText.setText(LinkingValidatorConstants.deeplinkPathPromptText);
+                break;
+            case CUSTOM:
+                customKVPField.setVisibility(View.VISIBLE);
+                linkingValidatorText.setText(LinkingValidatorConstants.customKeyPromptText);
+                break;
+        }
+    }
+
+    void GenerateBranchLinks() {
+
+    }
 }
diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
index 06c3e5a7d..950c736c6 100644
--- a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -7,7 +7,7 @@
     android:background="#FFFFFF">
 
     <LinearLayout
-        android:id="@+id/linearLayout"
+        android:id="@+id/linkingValidatorHeader"
         android:layout_width="409dp"
         android:layout_height="100dp"
         android:orientation="horizontal"
@@ -21,7 +21,7 @@
             android:layout_weight="0.1" />
 
         <ImageView
-            android:id="@+id/imageView"
+            android:id="@+id/branchLogoImage"
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_gravity="center"
@@ -29,7 +29,7 @@
             android:src="@drawable/branch_icon" />
 
         <TextView
-            android:id="@+id/textView"
+            android:id="@+id/linkingValidatorTitle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.65"
@@ -44,16 +44,16 @@
     </LinearLayout>
 
     <Spinner
-        android:id="@+id/spinner"
+        android:id="@+id/linkingValidatorDropdownMenu"
         android:layout_width="351dp"
         android:layout_height="50dp"
-        app:layout_constraintBottom_toTopOf="@+id/button"
+        app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText" />
 
     <TextView
-        android:id="@+id/textView2"
+        android:id="@+id/linkingValidatorText"
         android:layout_width="312dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
@@ -62,10 +62,22 @@
         android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader" />
+
+    <EditText
+        android:id="@+id/linkingValidatorEditText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:hint="Enter a value"
+        android:inputType="text"
+        app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText" />
 
     <Button
-        android:id="@+id/button"
+        android:id="@+id/linkingValidatorButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="50dp"
@@ -75,4 +87,51 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/customKVPField"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="0.1" />
+
+        <EditText
+            android:id="@+id/keyEditText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.35"
+            android:ems="10"
+            android:hint="key"
+            android:inputType="text"
+            android:text="" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="0.1" />
+
+        <EditText
+            android:id="@+id/valueEditText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.35"
+            android:ems="10"
+            android:hint="value"
+            android:inputType="text"
+            android:text="" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="0.1" />
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From bfb9f04063ab9cbc4dc48d611b239df1a9f486a7 Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 25 Oct 2024 15:09:16 -0400
Subject: [PATCH 05/14] Added code to generate the various types of Branch
 links for testing

Added code to generate the various types of Branch links for testing
---
 .../validators/LinkingValidatorConstants.java |  2 +
 .../validators/LinkingValidatorDialog.java    | 41 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
index 7b53dbbe2..e6e213ac6 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
@@ -6,4 +6,6 @@ public class LinkingValidatorConstants {
         public static final String customKeyPromptText = "Please enter your custom key and value for routing";
         public static final String step1ButtonText = "Next";
         public static final String step2ButtonText = "  Generate Links for Testing  ";
+        public static final String canonicalUrlKey = "$canonical_url";
+        public static final String deeplinkPathKey = "$deeplink_path";
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 1ca87b638..8669a055e 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -15,7 +15,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.branch.indexing.BranchUniversalObject;
 import io.branch.referral.R;
+import io.branch.referral.util.LinkProperties;
 
 public class LinkingValidatorDialog extends Dialog implements AdapterView.OnItemSelectedListener {
 
@@ -27,16 +29,26 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private EditText linkingValidatorEditText;
     private LinearLayout customKVPField;
     private int step = 1;
+    private String routingKey = "";
+    private String routingValue = "";
+    private EditText customKeyEditText;
+    private EditText customValueEditText;
+    private Context context;
+    private String regularBranchLink; //ordinary Branch link to test App Links / Universal Links
+    private String uriFallbackBranchLink; //Branch link with URI redirect mode of 2
+    private String webOnlyBranchLink; //Web-only Branch link
+    private String missingDeeplinkDataBranchLink; //Branch link with empty deep link data (to test graceful handling when data is missing)
 
     public LinkingValidatorDialog(final Context context) {
         super(context);
+        this.context = context;
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         this.setContentView(R.layout.dialog_linking_validator);
 
         linkingValidatorDropdownMenu = findViewById(R.id.linkingValidatorDropdownMenu);
         List<String> choices = new ArrayList<>();
-        choices.add("$canonical_url");
-        choices.add("$deeplink_path");
+        choices.add(LinkingValidatorConstants.canonicalUrlKey);
+        choices.add(LinkingValidatorConstants.deeplinkPathKey);
         choices.add("other (custom)");
         ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, choices);
         dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -93,10 +105,14 @@ 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);
@@ -106,6 +122,27 @@ void LoadStep2Screen() {
     }
 
     void GenerateBranchLinks() {
+        customKeyEditText = findViewById(R.id.keyEditText);
+        customValueEditText = findViewById(R.id.valueEditText);
 
+        //if routing key is empty, it is a custom key outside of $canonical_url and $deeplink_path
+        if(routingKey.isEmpty()) {
+            routingKey = customKeyEditText.getText().toString();
+            routingValue = customValueEditText.getText().toString();
+        }
+
+        regularBranchLink = GenerateBranchLink("regularBranchLink", routingKey, routingValue);
+        uriFallbackBranchLink = GenerateBranchLink("uriFallbackBranchLink", "$uri_redirect_mode", "2", routingKey, routingValue);
+        webOnlyBranchLink = GenerateBranchLink("webOnlyBranchLink", "$web_only", "true", routingKey, routingValue);
+        missingDeeplinkDataBranchLink = GenerateBranchLink("missingDataBranchLink", routingKey, "");
+    }
+
+    String GenerateBranchLink(String identifierForBUO, String... params) {
+        LinkProperties lp = new LinkProperties();
+        for(int i = 0; i < params.length; i+=2) {
+            lp.addControlParameter(params[i], params[i+1]);
+        }
+        BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(identifierForBUO);
+        return buo.getShortUrl(context, lp);
     }
 }

From 4bfd3153d54c10cc1060b614e345401fd50fd037 Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 25 Oct 2024 15:36:37 -0400
Subject: [PATCH 06/14] Laid out the UI for step 3 of the modal (link & use
 case testing)

Laid out the UI for step 3 of the modal (link & use case testing)
---
 .../referral/validators/LinkingValidator.java |   1 -
 .../validators/LinkingValidatorConstants.java |   1 +
 .../validators/LinkingValidatorDialog.java    |   2 +
 .../res/layout/dialog_linking_validator.xml   | 339 +++++++++++++++++-
 4 files changed, 341 insertions(+), 2 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
index 2161ea2e6..aff2c56bd 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
@@ -27,6 +27,5 @@ private void validateDeepLinkRouting(Context context) {
         lp.height = 1000;
         instance.linkingValidatorDialog.show();
         instance.linkingValidatorDialog.getWindow().setAttributes(lp);
-
     }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
index e6e213ac6..aba95578a 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
@@ -6,6 +6,7 @@ public class LinkingValidatorConstants {
         public static final String customKeyPromptText = "Please enter your custom key and value for routing";
         public static final String step1ButtonText = "Next";
         public static final String step2ButtonText = "  Generate Links for Testing  ";
+        public static final String step3ButtonText = "Done";
         public static final String canonicalUrlKey = "$canonical_url";
         public static final String deeplinkPathKey = "$deeplink_path";
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 8669a055e..886e016ae 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -122,6 +122,8 @@ void LoadStep2Screen() {
     }
 
     void GenerateBranchLinks() {
+        ctaButton.setText(LinkingValidatorConstants.step3ButtonText);
+
         customKeyEditText = findViewById(R.id.keyEditText);
         customValueEditText = findViewById(R.id.valueEditText);
 
diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
index 950c736c6..e63a9656b 100644
--- a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -11,9 +11,11 @@
         android:layout_width="409dp"
         android:layout_height="100dp"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
 
         <Space
             android:layout_width="0dp"
@@ -47,6 +49,7 @@
         android:id="@+id/linkingValidatorDropdownMenu"
         android:layout_width="351dp"
         android:layout_height="50dp"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -60,6 +63,7 @@
         android:gravity="center"
         android:text="What key do you use for deep link routing?"
         android:textSize="20sp"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader" />
@@ -71,6 +75,7 @@
         android:ems="10"
         android:hint="Enter a value"
         android:inputType="text"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -93,6 +98,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -134,4 +140,335 @@
             android:layout_weight="0.1" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader">
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:text="Here are links for testing:"
+            android:textSize="20sp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="0.5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:text="Primary deep linking"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/button"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Info"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Copy"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button3"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Share"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button4"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Debug"
+                android:textSize="10sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:layout_weight="0.5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:text="Fallback deep linking"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/button5"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Info"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button6"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Copy"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button7"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Share"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button8"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Debug"
+                android:textSize="10sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:layout_weight="0.5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:text="Web-Only Link"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/button9"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Info"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button10"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Copy"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button11"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Share"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button12"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Debug"
+                android:textSize="10sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:layout_weight="0.5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:text="Missing link data"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/button13"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Info"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button14"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Copy"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button15"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Share"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button16"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Debug"
+                android:textSize="10sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="0.5" />
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:text="Additional use cases to test:"
+            android:textSize="20sp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="0.5" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:layout_weight="0.5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView7"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:text="Warm Start"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/button17"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Info"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button18"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.3"
+                android:text="Test"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button20"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Debug"
+                android:textSize="10sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:layout_weight="0.5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView8"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:text="Warm Start"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/button21"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Info"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button22"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.3"
+                android:text="Test"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/button23"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.15"
+                android:text="Debug"
+                android:textSize="10sp" />
+        </LinearLayout>
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8fc360a0ca5e3e8a586c37c2f3b48e767b81c5ea Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Tue, 29 Oct 2024 11:13:38 -0400
Subject: [PATCH 07/14] Added constants and built out a deep link validator row
 class to encapsulate each row

Added constants and built out a deep link validator row class to encapsulate each row
---
 .../referral/validators/LinkingValidator.java |   2 +-
 .../validators/LinkingValidatorConstants.java |  21 ++
 .../validators/LinkingValidatorDialog.java    |   3 +
 .../LinkingValidatorDialogRowItem.java        |  30 +++
 .../res/layout/dialog_linking_validator.xml   | 207 ++----------------
 .../linking_validator_dialog_row_item.xml     |  54 +++++
 6 files changed, 127 insertions(+), 190 deletions(-)
 create mode 100644 Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
 create mode 100644 Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
index aff2c56bd..919f996f1 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidator.java
@@ -24,7 +24,7 @@ private void validateDeepLinkRouting(Context context) {
         WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
         lp.copyFrom(Objects.requireNonNull(instance.linkingValidatorDialog.getWindow()).getAttributes());
         lp.width = WindowManager.LayoutParams.MATCH_PARENT;
-        lp.height = 1000;
+        lp.height = 2000;
         instance.linkingValidatorDialog.show();
         instance.linkingValidatorDialog.getWindow().setAttributes(lp);
     }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
index aba95578a..77c9fe47e 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
@@ -9,4 +9,25 @@ public class LinkingValidatorConstants {
         public static final String step3ButtonText = "Done";
         public static final String canonicalUrlKey = "$canonical_url";
         public static final String deeplinkPathKey = "$deeplink_path";
+
+        public static final String linkingValidatorRow1Title = "Link using App Link";
+        public static final String linkingValidatorRow2Title = "Link using URI scheme";
+        public static final String linkingValidatorRow3Title = "Web-only link";
+        public static final String linkingValidatorRow4Title = "Link with missing data";
+
+        public static final String infoButton1Copy = "Verifies that Universal Links / App Links are working correctly for your Branch domain";
+        public static final String infoButton2Copy = "Verifies that URI schemes work correctly for your Branch domain";
+        public static final String infoButton3Copy = "Verifies that web-only links are handled correctly to take you to the mobile web";
+        public static final String infoButton4Copy = "Verifies that your app gracefully handles Branch links missing deep link data";
+        public static final String infoButton5Copy = "Click the button to simulate a deep link click for the warm start use case";
+        public static final String infoButton6Copy = "Click the button to simulate a deep link click for the foreground use case";
+
+        public static final String debugButton1Copy = "Ensure you’ve entered the correct SHA 256s on the dashboard and added your Branch domains to the Android Manifest";
+        public static final String debugButton2Copy = "Ensure that you’ve added a unique Branch URI scheme to the dashboard and Android Manifest";
+        public static final String debugButton3Copy = "Ensure that your code checks for $web-only in the link data, and if it is true routes the user to the mobile web";
+        public static final String debugButton4Copy = "Ensure that your code gracefully handles missing or invalid deep link data like taking them to the home screen";
+        public static final String debugButton5Copy = "Ensure that you are initializing Branch inside of onStart() and that the code is called anytime the app enters the foreground";
+        public static final String debugButton6Copy = "Ensure that you are calling reInit() inside of onNewIntent() after checking if branch_force_new_session is true";
+
+
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 886e016ae..89f106ece 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -38,6 +38,7 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private String uriFallbackBranchLink; //Branch link with URI redirect mode of 2
     private String webOnlyBranchLink; //Web-only Branch link
     private String missingDeeplinkDataBranchLink; //Branch link with empty deep link data (to test graceful handling when data is missing)
+    private LinkingValidatorDialogRowItem row1;
 
     public LinkingValidatorDialog(final Context context) {
         super(context);
@@ -123,6 +124,8 @@ void LoadStep2Screen() {
 
     void GenerateBranchLinks() {
         ctaButton.setText(LinkingValidatorConstants.step3ButtonText);
+        row1 = findViewById(R.id.linkingValidatorRow1);
+        row1.SetTitleText(LinkingValidatorConstants.linkingValidatorRow1Title);
 
         customKeyEditText = findViewById(R.id.keyEditText);
         customValueEditText = findViewById(R.id.valueEditText);
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
new file mode 100644
index 000000000..4ef9692fc
--- /dev/null
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -0,0 +1,30 @@
+package io.branch.referral.validators;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import io.branch.referral.R;
+
+public class LinkingValidatorDialogRowItem extends LinearLayout {
+
+    TextView titleText;
+
+    public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
+        this.addView(view);
+        titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
+    }
+
+    public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public void SetTitleText(String title) {
+        titleText.setText(title);
+    }
+}
diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
index e63a9656b..55740de49 100644
--- a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -49,7 +49,7 @@
         android:id="@+id/linkingValidatorDropdownMenu"
         android:layout_width="351dp"
         android:layout_height="50dp"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
         android:gravity="center"
         android:text="What key do you use for deep link routing?"
         android:textSize="20sp"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader" />
@@ -75,7 +75,7 @@
         android:ems="10"
         android:hint="Enter a value"
         android:inputType="text"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -149,7 +149,8 @@
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader">
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/textView"
@@ -163,208 +164,36 @@
             android:layout_height="30dp"
             android:layout_weight="0.5" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView2"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:text="Primary deep linking"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/button"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Info"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button2"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Copy"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button3"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Share"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button4"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Debug"
-                android:textSize="10sp" />
-
-        </LinearLayout>
+        <include
+            android:id="@+id/linkingValidatorRow1"
+            layout="@layout/linking_validator_dialog_row_item" />
 
         <Space
             android:layout_width="0dp"
             android:layout_height="10dp"
             android:layout_weight="0.5" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:text="Fallback deep linking"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/button5"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Info"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button6"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Copy"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button7"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Share"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button8"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Debug"
-                android:textSize="10sp" />
-
-        </LinearLayout>
+        <include
+            android:id="@+id/linkingValidatorRow2"
+            layout="@layout/linking_validator_dialog_row_item" />
 
         <Space
             android:layout_width="0dp"
             android:layout_height="10dp"
             android:layout_weight="0.5" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView4"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:text="Web-Only Link"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/button9"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Info"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button10"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Copy"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button11"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Share"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button12"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Debug"
-                android:textSize="10sp" />
-
-        </LinearLayout>
+        <include
+            android:id="@+id/linkingValidatorRow3"
+            layout="@layout/linking_validator_dialog_row_item" />
 
         <Space
             android:layout_width="0dp"
             android:layout_height="10dp"
             android:layout_weight="0.5" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView5"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:text="Missing link data"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/button13"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Info"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button14"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Copy"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button15"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Share"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button16"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Debug"
-                android:textSize="10sp" />
-
-        </LinearLayout>
+        <include
+            android:id="@+id/linkingValidatorRow4"
+            layout="@layout/linking_validator_dialog_row_item" />
 
         <Space
             android:layout_width="0dp"
@@ -442,7 +271,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.4"
-                android:text="Warm Start"
+                android:text="Foreground click"
                 android:textSize="16sp" />
 
             <Button
diff --git a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
new file mode 100644
index 000000000..85ca5263d
--- /dev/null
+++ b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/linkingValidatorRowTitleText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.4"
+            android:text="Title"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/linkingValidatorRowInfoButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.15"
+            android:text="Info"
+            android:textSize="10sp" />
+
+        <Button
+            android:id="@+id/linkingValidatorRowCopyButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.15"
+            android:text="Copy"
+            android:textSize="10sp" />
+
+        <Button
+            android:id="@+id/linkingValidatorRowShareButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.15"
+            android:text="Share"
+            android:textSize="10sp" />
+
+        <Button
+            android:id="@+id/linkingValidatorRowDebugButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.15"
+            android:text="Debug"
+            android:textSize="10sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

From 5a37852953d157ae86212243b390207c13d81e2e Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Wed, 30 Oct 2024 15:12:10 -0400
Subject: [PATCH 08/14] Got the info buttons showing the relevant tooltips

Got the info buttons showing the relevant tooltips
---
 .../validators/LinkingValidatorDialog.java    | 22 ++++++-
 .../LinkingValidatorDialogRowItem.java        | 23 +++++--
 .../res/layout/dialog_linking_validator.xml   | 60 +++++++++----------
 .../linking_validator_dialog_row_item.xml     | 10 ++--
 4 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 89f106ece..4b7e1ea09 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -28,6 +28,7 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private TextView linkingValidatorText;
     private EditText linkingValidatorEditText;
     private LinearLayout customKVPField;
+    private LinearLayout linkingValidatorRowsLayout;
     private int step = 1;
     private String routingKey = "";
     private String routingValue = "";
@@ -39,6 +40,9 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private String webOnlyBranchLink; //Web-only Branch link
     private String missingDeeplinkDataBranchLink; //Branch link with empty deep link data (to test graceful handling when data is missing)
     private LinkingValidatorDialogRowItem row1;
+    private LinkingValidatorDialogRowItem row2;
+    private LinkingValidatorDialogRowItem row3;
+    private LinkingValidatorDialogRowItem row4;
 
     public LinkingValidatorDialog(final Context context) {
         super(context);
@@ -69,11 +73,18 @@ public LinkingValidatorDialog(final Context context) {
         linkingValidatorText = findViewById(R.id.linkingValidatorText);
         linkingValidatorEditText = findViewById(R.id.linkingValidatorEditText);
         customKVPField = findViewById(R.id.customKVPField);
+        linkingValidatorRowsLayout = findViewById(R.id.linkingValidatorRows);
 
         linkingValidatorEditText.setVisibility(View.GONE);
         customKVPField.setVisibility(View.GONE);
+        linkingValidatorRowsLayout.setVisibility(View.GONE);
 
         routingType = ROUTING_TYPE.CANONICAL_URL;
+
+        row1 = findViewById(R.id.linkingValidatorRow1);
+        row2 = findViewById(R.id.linkingValidatorRow2);
+        row3 = findViewById(R.id.linkingValidatorRow3);
+        row4 = findViewById(R.id.linkingValidatorRow4);
     }
 
     @Override
@@ -123,9 +134,15 @@ void LoadStep2Screen() {
     }
 
     void GenerateBranchLinks() {
+        linkingValidatorEditText.setVisibility(View.GONE);
+        linkingValidatorText.setVisibility(View.GONE);
         ctaButton.setText(LinkingValidatorConstants.step3ButtonText);
-        row1 = findViewById(R.id.linkingValidatorRow1);
-        row1.SetTitleText(LinkingValidatorConstants.linkingValidatorRow1Title);
+        linkingValidatorRowsLayout.setVisibility(View.VISIBLE);
+
+        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy);
+        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy);
+        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy);
+        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy);
 
         customKeyEditText = findViewById(R.id.keyEditText);
         customValueEditText = findViewById(R.id.valueEditText);
@@ -140,6 +157,7 @@ void GenerateBranchLinks() {
         uriFallbackBranchLink = GenerateBranchLink("uriFallbackBranchLink", "$uri_redirect_mode", "2", routingKey, routingValue);
         webOnlyBranchLink = GenerateBranchLink("webOnlyBranchLink", "$web_only", "true", routingKey, routingValue);
         missingDeeplinkDataBranchLink = GenerateBranchLink("missingDataBranchLink", routingKey, "");
+
     }
 
     String GenerateBranchLink(String identifierForBUO, String... params) {
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index 4ef9692fc..d4d428a2f 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -1,9 +1,11 @@
 package io.branch.referral.validators;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -11,20 +13,33 @@
 
 public class LinkingValidatorDialogRowItem extends LinearLayout {
 
+    Context context;
     TextView titleText;
+    Button infoButton;
+    String infoText;
 
     public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs) {
         super(context, attrs);
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
-        this.addView(view);
-        titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
+        this.context = context;
     }
 
     public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        this.context = context;
     }
 
-    public void SetTitleText(String title) {
+    public void InitializeRow(String title, String infoText) {
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
+        this.addView(view);
+        titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
+        infoButton = view.findViewById(R.id.linkingValidatorRowInfoButton);
         titleText.setText(title);
+        this.infoText = infoText;
+        infoButton.setOnClickListener(view1 -> {
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setMessage(infoText).setTitle(titleText.getText());
+            AlertDialog dialog = builder.create();
+            dialog.show();
+        });
     }
 }
diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
index 55740de49..c25606661 100644
--- a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -11,11 +11,9 @@
         android:layout_width="409dp"
         android:layout_height="100dp"
         android:orientation="horizontal"
-        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible">
+        app:layout_constraintTop_toTopOf="parent">
 
         <Space
             android:layout_width="0dp"
@@ -49,11 +47,12 @@
         android:id="@+id/linkingValidatorDropdownMenu"
         android:layout_width="351dp"
         android:layout_height="50dp"
-        android:visibility="visible"
+        android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText" />
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText"
+        tools:visibility="invisible" />
 
     <TextView
         android:id="@+id/linkingValidatorText"
@@ -63,7 +62,7 @@
         android:gravity="center"
         android:text="What key do you use for deep link routing?"
         android:textSize="20sp"
-        android:visibility="visible"
+        android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader" />
@@ -75,7 +74,7 @@
         android:ems="10"
         android:hint="Enter a value"
         android:inputType="text"
-        android:visibility="visible"
+        android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -141,16 +140,17 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/linkingValidatorRows"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
         android:orientation="vertical"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader"
-        android:visibility="gone">
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader">
 
         <TextView
             android:id="@+id/textView"
@@ -161,51 +161,50 @@
 
         <Space
             android:layout_width="0dp"
-            android:layout_height="30dp"
-            android:layout_weight="0.5" />
+            android:layout_height="30dp" />
 
-        <include
+        <io.branch.referral.validators.LinkingValidatorDialogRowItem
             android:id="@+id/linkingValidatorRow1"
-            layout="@layout/linking_validator_dialog_row_item" />
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
 
         <Space
             android:layout_width="0dp"
-            android:layout_height="10dp"
-            android:layout_weight="0.5" />
+            android:layout_height="10dp" />
 
-        <include
+        <io.branch.referral.validators.LinkingValidatorDialogRowItem
             android:id="@+id/linkingValidatorRow2"
-            layout="@layout/linking_validator_dialog_row_item" />
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
 
         <Space
             android:layout_width="0dp"
-            android:layout_height="10dp"
-            android:layout_weight="0.5" />
+            android:layout_height="10dp" />
 
-        <include
+        <io.branch.referral.validators.LinkingValidatorDialogRowItem
             android:id="@+id/linkingValidatorRow3"
-            layout="@layout/linking_validator_dialog_row_item" />
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
 
         <Space
             android:layout_width="0dp"
-            android:layout_height="10dp"
-            android:layout_weight="0.5" />
+            android:layout_height="10dp" />
 
-        <include
+        <io.branch.referral.validators.LinkingValidatorDialogRowItem
             android:id="@+id/linkingValidatorRow4"
-            layout="@layout/linking_validator_dialog_row_item" />
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
 
         <Space
             android:layout_width="0dp"
-            android:layout_height="30dp"
-            android:layout_weight="0.5" />
+            android:layout_height="30dp" />
 
         <TextView
             android:id="@+id/textView6"
             android:layout_width="match_parent"
             android:layout_height="30dp"
-            android:text="Additional use cases to test:"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            android:text="Additional use cases to test:" />
 
         <Space
             android:layout_width="0dp"
@@ -214,8 +213,7 @@
 
         <Space
             android:layout_width="0dp"
-            android:layout_height="10dp"
-            android:layout_weight="0.5" />
+            android:layout_height="10dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
index 85ca5263d..9ae560032 100644
--- a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
+++ b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0.4"
             android:text="Title"
-            android:textSize="16sp" />
+            android:textSize="14sp" />
 
         <Button
             android:id="@+id/linkingValidatorRowInfoButton"
@@ -23,7 +23,7 @@
             android:layout_height="match_parent"
             android:layout_weight="0.15"
             android:text="Info"
-            android:textSize="10sp" />
+            android:textSize="9sp" />
 
         <Button
             android:id="@+id/linkingValidatorRowCopyButton"
@@ -31,7 +31,7 @@
             android:layout_height="match_parent"
             android:layout_weight="0.15"
             android:text="Copy"
-            android:textSize="10sp" />
+            android:textSize="9sp" />
 
         <Button
             android:id="@+id/linkingValidatorRowShareButton"
@@ -39,7 +39,7 @@
             android:layout_height="match_parent"
             android:layout_weight="0.15"
             android:text="Share"
-            android:textSize="10sp" />
+            android:textSize="9sp" />
 
         <Button
             android:id="@+id/linkingValidatorRowDebugButton"
@@ -47,7 +47,7 @@
             android:layout_height="match_parent"
             android:layout_weight="0.15"
             android:text="Debug"
-            android:textSize="10sp" />
+            android:textSize="9sp" />
 
     </LinearLayout>
 

From eb5c4ba1c80345758e06a1faaa0ff9043227b76c Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Thu, 31 Oct 2024 15:12:47 -0400
Subject: [PATCH 09/14] Added share button functionality

Added share button functionality
---
 .../validators/LinkingValidatorDialog.java    | 27 +-----
 .../LinkingValidatorDialogRowItem.java        | 83 +++++++++++++++++--
 .../linking_validator_dialog_row_item.xml     | 14 +---
 3 files changed, 84 insertions(+), 40 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 4b7e1ea09..b0a7ce1fc 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -35,10 +35,6 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private EditText customKeyEditText;
     private EditText customValueEditText;
     private Context context;
-    private String regularBranchLink; //ordinary Branch link to test App Links / Universal Links
-    private String uriFallbackBranchLink; //Branch link with URI redirect mode of 2
-    private String webOnlyBranchLink; //Web-only Branch link
-    private String missingDeeplinkDataBranchLink; //Branch link with empty deep link data (to test graceful handling when data is missing)
     private LinkingValidatorDialogRowItem row1;
     private LinkingValidatorDialogRowItem row2;
     private LinkingValidatorDialogRowItem row3;
@@ -139,11 +135,6 @@ void GenerateBranchLinks() {
         ctaButton.setText(LinkingValidatorConstants.step3ButtonText);
         linkingValidatorRowsLayout.setVisibility(View.VISIBLE);
 
-        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy);
-        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy);
-        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy);
-        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy);
-
         customKeyEditText = findViewById(R.id.keyEditText);
         customValueEditText = findViewById(R.id.valueEditText);
 
@@ -153,19 +144,9 @@ void GenerateBranchLinks() {
             routingValue = customValueEditText.getText().toString();
         }
 
-        regularBranchLink = GenerateBranchLink("regularBranchLink", routingKey, routingValue);
-        uriFallbackBranchLink = GenerateBranchLink("uriFallbackBranchLink", "$uri_redirect_mode", "2", routingKey, routingValue);
-        webOnlyBranchLink = GenerateBranchLink("webOnlyBranchLink", "$web_only", "true", routingKey, routingValue);
-        missingDeeplinkDataBranchLink = GenerateBranchLink("missingDataBranchLink", routingKey, "");
-
-    }
-
-    String GenerateBranchLink(String identifierForBUO, String... params) {
-        LinkProperties lp = new LinkProperties();
-        for(int i = 0; i < params.length; i+=2) {
-            lp.addControlParameter(params[i], params[i+1]);
-        }
-        BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(identifierForBUO);
-        return buo.getShortUrl(context, lp);
+        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, routingKey, routingValue, "regularBranchLink");
+        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", "$uri_redirect_mode", "2");
+        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, routingKey, routingValue, "webOnlyBranchLink", "$web_only", "true");
+        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, routingKey, "", "missingDataBranchLink");
     }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index d4d428a2f..ef47bce4d 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -1,7 +1,10 @@
 package io.branch.referral.validators;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
+import android.content.ContextWrapper;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,14 +12,27 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.util.HashMap;
+
+import io.branch.indexing.BranchUniversalObject;
+import io.branch.referral.Branch;
+import io.branch.referral.BranchError;
 import io.branch.referral.R;
+import io.branch.referral.util.LinkProperties;
 
 public class LinkingValidatorDialogRowItem extends LinearLayout {
 
-    Context context;
+    private static final String TAG = "BranchSDK";
+
     TextView titleText;
     Button infoButton;
     String infoText;
+    Button shareButton;
+    HashMap<String, String> linkDataParams;
+    String routingKey;
+    String routingValue;
+    String canonicalIdentifier;
+    Context context;
 
     public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -28,18 +44,73 @@ public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs, int de
         this.context = context;
     }
 
-    public void InitializeRow(String title, String infoText) {
+    public void InitializeRow(String title, String infoText, String routingKey, String routingValue, String canonicalIdentifier, String... params) {
         View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
         this.addView(view);
         titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
         infoButton = view.findViewById(R.id.linkingValidatorRowInfoButton);
+        shareButton = view.findViewById(R.id.linkingValidatorRowShareButton);
+
         titleText.setText(title);
         this.infoText = infoText;
+        this.routingKey = routingKey;
+        this.routingValue = routingValue;
+        this.canonicalIdentifier = canonicalIdentifier;
+
+        linkDataParams = new HashMap<>();
+
+        for (int i = 0; i < params.length; i += 2) {
+            linkDataParams.put(params[i], params[i + 1]);
+        }
+
         infoButton.setOnClickListener(view1 -> {
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setMessage(infoText).setTitle(titleText.getText());
-            AlertDialog dialog = builder.create();
-            dialog.show();
+            HandleInfoButtonClicked();
+        });
+
+        shareButton.setOnClickListener(view2 -> {
+            HandleShareButtonClicked();
         });
     }
+
+    private void HandleInfoButtonClicked() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(infoText).setTitle(titleText.getText());
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void HandleShareButtonClicked() {
+        LinkProperties lp = new LinkProperties();
+        for (String key : linkDataParams.keySet()) {
+            lp.addControlParameter(key, linkDataParams.get(key));
+        }
+        BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(canonicalIdentifier);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            Branch.getInstance().share(getActivity(context), buo, lp, new Branch.BranchNativeLinkShareListener() {
+                        @Override
+                        public void onLinkShareResponse(String sharedLink, BranchError error) {
+                        }
+
+                        @Override
+                        public void onChannelSelected(String channelName) {
+                        }
+                    },
+                    titleText.getText().toString(),
+                    infoText);
+        }
+    }
+
+    public Activity getActivity(Context context) {
+        if (context == null) {
+            return null;
+        } else if (context instanceof ContextWrapper) {
+            if (context instanceof Activity) {
+                return (Activity) context;
+            } else {
+                return getActivity(((ContextWrapper) context).getBaseContext());
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
index 9ae560032..a88dd542e 100644
--- a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
+++ b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
@@ -21,23 +21,15 @@
             android:id="@+id/linkingValidatorRowInfoButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.15"
+            android:layout_weight="0.2"
             android:text="Info"
             android:textSize="9sp" />
 
-        <Button
-            android:id="@+id/linkingValidatorRowCopyButton"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.15"
-            android:text="Copy"
-            android:textSize="9sp" />
-
         <Button
             android:id="@+id/linkingValidatorRowShareButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.15"
+            android:layout_weight="0.2"
             android:text="Share"
             android:textSize="9sp" />
 
@@ -45,7 +37,7 @@
             android:id="@+id/linkingValidatorRowDebugButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.15"
+            android:layout_weight="0.2"
             android:text="Debug"
             android:textSize="9sp" />
 

From 56d9fe45a1797c5436d0b9a860d531a1ac7f223f Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 1 Nov 2024 14:12:21 -0400
Subject: [PATCH 10/14] Added debug button functionality to show popup with how
 to fix deep link issue

Added debug button functionality to show popup with how to fix deep link issue
---
 .../validators/LinkingValidatorDialog.java      | 10 ++++------
 .../LinkingValidatorDialogRowItem.java          | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index b0a7ce1fc..3fe03c265 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -15,9 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.branch.indexing.BranchUniversalObject;
 import io.branch.referral.R;
-import io.branch.referral.util.LinkProperties;
 
 public class LinkingValidatorDialog extends Dialog implements AdapterView.OnItemSelectedListener {
 
@@ -144,9 +142,9 @@ void GenerateBranchLinks() {
             routingValue = customValueEditText.getText().toString();
         }
 
-        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, routingKey, routingValue, "regularBranchLink");
-        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", "$uri_redirect_mode", "2");
-        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, routingKey, routingValue, "webOnlyBranchLink", "$web_only", "true");
-        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, routingKey, "", "missingDataBranchLink");
+        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, LinkingValidatorConstants.debugButton1Copy, routingKey, routingValue, "regularBranchLink");
+        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, LinkingValidatorConstants.debugButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", "$uri_redirect_mode", "2");
+        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, LinkingValidatorConstants.debugButton3Copy, routingKey, routingValue, "webOnlyBranchLink", "$web_only", "true");
+        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, LinkingValidatorConstants.debugButton4Copy, routingKey, "", "missingDataBranchLink");
     }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index ef47bce4d..f4f1b618a 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -33,6 +33,8 @@ public class LinkingValidatorDialogRowItem extends LinearLayout {
     String routingValue;
     String canonicalIdentifier;
     Context context;
+    Button debugButton;
+    String debugText;
 
     public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -44,15 +46,17 @@ public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs, int de
         this.context = context;
     }
 
-    public void InitializeRow(String title, String infoText, String routingKey, String routingValue, String canonicalIdentifier, String... params) {
+    public void InitializeRow(String title, String infoText, String debugText, String routingKey, String routingValue, String canonicalIdentifier, String... params) {
         View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
         this.addView(view);
         titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
         infoButton = view.findViewById(R.id.linkingValidatorRowInfoButton);
         shareButton = view.findViewById(R.id.linkingValidatorRowShareButton);
+        debugButton = view.findViewById(R.id.linkingValidatorRowDebugButton);
 
         titleText.setText(title);
         this.infoText = infoText;
+        this.debugText = debugText;
         this.routingKey = routingKey;
         this.routingValue = routingValue;
         this.canonicalIdentifier = canonicalIdentifier;
@@ -70,6 +74,10 @@ public void InitializeRow(String title, String infoText, String routingKey, Stri
         shareButton.setOnClickListener(view2 -> {
             HandleShareButtonClicked();
         });
+
+        debugButton.setOnClickListener(view2 -> {
+            HandleDebugButtonClicked();
+        });
     }
 
     private void HandleInfoButtonClicked() {
@@ -100,6 +108,13 @@ public void onChannelSelected(String channelName) {
         }
     }
 
+    private void HandleDebugButtonClicked() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(debugText).setTitle(titleText.getText() + " not working?");
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
     public Activity getActivity(Context context) {
         if (context == null) {
             return null;

From 6acc83b6644e17eeaf803dea34167e7aca976712 Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 1 Nov 2024 14:41:40 -0400
Subject: [PATCH 11/14] Logic refactors so that each row uses uniform, modular
 code vs. hardcoded specifics

Logic refactors so that each row uses uniform, modular code vs. hardcoded specifics
---
 .../validators/LinkingValidatorConstants.java |  2 +
 .../validators/LinkingValidatorDialog.java    | 14 +++-
 .../LinkingValidatorDialogRowItem.java        | 22 +++--
 .../res/layout/dialog_linking_validator.xml   | 83 ++-----------------
 .../linking_validator_dialog_row_item.xml     |  2 +-
 5 files changed, 34 insertions(+), 89 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
index 77c9fe47e..6e0519ba3 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorConstants.java
@@ -14,6 +14,8 @@ public class LinkingValidatorConstants {
         public static final String linkingValidatorRow2Title = "Link using URI scheme";
         public static final String linkingValidatorRow3Title = "Web-only link";
         public static final String linkingValidatorRow4Title = "Link with missing data";
+        public static final String linkingValidatorRow5Title = "Warm start use case";
+        public static final String linkingValidatorRow6Title = "Foreground click use case";
 
         public static final String infoButton1Copy = "Verifies that Universal Links / App Links are working correctly for your Branch domain";
         public static final String infoButton2Copy = "Verifies that URI schemes work correctly for your Branch domain";
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 3fe03c265..81bc1b90c 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -37,6 +37,8 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private LinkingValidatorDialogRowItem row2;
     private LinkingValidatorDialogRowItem row3;
     private LinkingValidatorDialogRowItem row4;
+    private LinkingValidatorDialogRowItem row5;
+    private LinkingValidatorDialogRowItem row6;
 
     public LinkingValidatorDialog(final Context context) {
         super(context);
@@ -79,6 +81,8 @@ public LinkingValidatorDialog(final Context context) {
         row2 = findViewById(R.id.linkingValidatorRow2);
         row3 = findViewById(R.id.linkingValidatorRow3);
         row4 = findViewById(R.id.linkingValidatorRow4);
+        row5 = findViewById(R.id.linkingValidatorRow5);
+        row6 = findViewById(R.id.linkingValidatorRow6);
     }
 
     @Override
@@ -142,9 +146,11 @@ void GenerateBranchLinks() {
             routingValue = customValueEditText.getText().toString();
         }
 
-        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, LinkingValidatorConstants.debugButton1Copy, routingKey, routingValue, "regularBranchLink");
-        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, LinkingValidatorConstants.debugButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", "$uri_redirect_mode", "2");
-        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, LinkingValidatorConstants.debugButton3Copy, routingKey, routingValue, "webOnlyBranchLink", "$web_only", "true");
-        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, LinkingValidatorConstants.debugButton4Copy, routingKey, "", "missingDataBranchLink");
+        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, LinkingValidatorConstants.debugButton1Copy, routingKey, routingValue, "regularBranchLink", true);
+        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, LinkingValidatorConstants.debugButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", true, "$uri_redirect_mode", "2");
+        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, LinkingValidatorConstants.debugButton3Copy, routingKey, routingValue, "webOnlyBranchLink", true, "$web_only", "true");
+        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, LinkingValidatorConstants.debugButton4Copy, routingKey, "", "missingDataBranchLink", true);
+        row5.InitializeRow(LinkingValidatorConstants.linkingValidatorRow5Title, LinkingValidatorConstants.infoButton5Copy, LinkingValidatorConstants.debugButton5Copy, routingKey, routingValue, "warmStartUseCase", false);
+        row6.InitializeRow(LinkingValidatorConstants.linkingValidatorRow6Title, LinkingValidatorConstants.infoButton6Copy, LinkingValidatorConstants.debugButton6Copy, routingKey, routingValue, "foregroundClickUseCase", false);
     }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index f4f1b618a..47d3f148d 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -27,7 +27,7 @@ public class LinkingValidatorDialogRowItem extends LinearLayout {
     TextView titleText;
     Button infoButton;
     String infoText;
-    Button shareButton;
+    Button actionButton;
     HashMap<String, String> linkDataParams;
     String routingKey;
     String routingValue;
@@ -46,12 +46,12 @@ public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs, int de
         this.context = context;
     }
 
-    public void InitializeRow(String title, String infoText, String debugText, String routingKey, String routingValue, String canonicalIdentifier, String... params) {
+    public void InitializeRow(String title, String infoText, String debugText, String routingKey, String routingValue, String canonicalIdentifier, boolean isSharableLink, String... params) {
         View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
         this.addView(view);
         titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
         infoButton = view.findViewById(R.id.linkingValidatorRowInfoButton);
-        shareButton = view.findViewById(R.id.linkingValidatorRowShareButton);
+        actionButton = view.findViewById(R.id.linkingValidatorRowActionButton);
         debugButton = view.findViewById(R.id.linkingValidatorRowDebugButton);
 
         titleText.setText(title);
@@ -71,13 +71,21 @@ public void InitializeRow(String title, String infoText, String debugText, Strin
             HandleInfoButtonClicked();
         });
 
-        shareButton.setOnClickListener(view2 -> {
-            HandleShareButtonClicked();
-        });
-
         debugButton.setOnClickListener(view2 -> {
             HandleDebugButtonClicked();
         });
+
+        if(isSharableLink) {
+            actionButton.setText("Share");
+
+            actionButton.setOnClickListener(view2 -> {
+                HandleShareButtonClicked();
+            });
+        } else {
+            actionButton.setText("Test");
+
+
+        }
     }
 
     private void HandleInfoButtonClicked() {
diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
index c25606661..0693ece31 100644
--- a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -211,91 +211,20 @@
             android:layout_height="30dp"
             android:layout_weight="0.5" />
 
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="10dp" />
-
-        <LinearLayout
+        <io.branch.referral.validators.LinkingValidatorDialogRowItem
+            android:id="@+id/linkingValidatorRow5"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView7"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:text="Warm Start"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/button17"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Info"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button18"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.3"
-                android:text="Test"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button20"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Debug"
-                android:textSize="10sp" />
-
-        </LinearLayout>
+            android:layout_height="50dp" />
 
         <Space
             android:layout_width="0dp"
             android:layout_height="10dp"
             android:layout_weight="0.5" />
 
-        <LinearLayout
+        <io.branch.referral.validators.LinkingValidatorDialogRowItem
+            android:id="@+id/linkingValidatorRow6"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView8"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:text="Foreground click"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/button21"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Info"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button22"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.3"
-                android:text="Test"
-                android:textSize="10sp" />
-
-            <Button
-                android:id="@+id/button23"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.15"
-                android:text="Debug"
-                android:textSize="10sp" />
-        </LinearLayout>
+            android:layout_height="50dp" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
index a88dd542e..8f26947f7 100644
--- a/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
+++ b/Branch-SDK/src/main/res/layout/linking_validator_dialog_row_item.xml
@@ -26,7 +26,7 @@
             android:textSize="9sp" />
 
         <Button
-            android:id="@+id/linkingValidatorRowShareButton"
+            android:id="@+id/linkingValidatorRowActionButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"

From 33979fd733ad0d3f5d91ff38833856dd184b668a Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 1 Nov 2024 15:02:50 -0400
Subject: [PATCH 12/14] Added foreground click use case

Added foreground click use case
---
 .../validators/LinkingValidatorDialog.java    | 12 +++++------
 .../LinkingValidatorDialogRowItem.java        | 20 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 81bc1b90c..057322835 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -146,11 +146,11 @@ void GenerateBranchLinks() {
             routingValue = customValueEditText.getText().toString();
         }
 
-        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, LinkingValidatorConstants.debugButton1Copy, routingKey, routingValue, "regularBranchLink", true);
-        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, LinkingValidatorConstants.debugButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", true, "$uri_redirect_mode", "2");
-        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, LinkingValidatorConstants.debugButton3Copy, routingKey, routingValue, "webOnlyBranchLink", true, "$web_only", "true");
-        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, LinkingValidatorConstants.debugButton4Copy, routingKey, "", "missingDataBranchLink", true);
-        row5.InitializeRow(LinkingValidatorConstants.linkingValidatorRow5Title, LinkingValidatorConstants.infoButton5Copy, LinkingValidatorConstants.debugButton5Copy, routingKey, routingValue, "warmStartUseCase", false);
-        row6.InitializeRow(LinkingValidatorConstants.linkingValidatorRow6Title, LinkingValidatorConstants.infoButton6Copy, LinkingValidatorConstants.debugButton6Copy, routingKey, routingValue, "foregroundClickUseCase", false);
+        row1.InitializeRow(LinkingValidatorConstants.linkingValidatorRow1Title, LinkingValidatorConstants.infoButton1Copy, LinkingValidatorConstants.debugButton1Copy, routingKey, routingValue, "regularBranchLink", true, 0);
+        row2.InitializeRow(LinkingValidatorConstants.linkingValidatorRow2Title, LinkingValidatorConstants.infoButton2Copy, LinkingValidatorConstants.debugButton2Copy, routingKey, routingValue, "uriFallbackBranchLink", true, 1, "$uri_redirect_mode", "2");
+        row3.InitializeRow(LinkingValidatorConstants.linkingValidatorRow3Title, LinkingValidatorConstants.infoButton3Copy, LinkingValidatorConstants.debugButton3Copy, routingKey, routingValue, "webOnlyBranchLink", true, 2, "$web_only", "true");
+        row4.InitializeRow(LinkingValidatorConstants.linkingValidatorRow4Title, LinkingValidatorConstants.infoButton4Copy, LinkingValidatorConstants.debugButton4Copy, routingKey, "", "missingDataBranchLink", true, 3);
+        row5.InitializeRow(LinkingValidatorConstants.linkingValidatorRow5Title, LinkingValidatorConstants.infoButton5Copy, LinkingValidatorConstants.debugButton5Copy, routingKey, routingValue, "warmStartUseCase", false, 4);
+        row6.InitializeRow(LinkingValidatorConstants.linkingValidatorRow6Title, LinkingValidatorConstants.infoButton6Copy, LinkingValidatorConstants.debugButton6Copy, routingKey, routingValue, "foregroundClickUseCase", false, 5);
     }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index 47d3f148d..77668058b 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -4,6 +4,7 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.content.Intent;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -46,7 +47,7 @@ public LinkingValidatorDialogRowItem(Context context, AttributeSet attrs, int de
         this.context = context;
     }
 
-    public void InitializeRow(String title, String infoText, String debugText, String routingKey, String routingValue, String canonicalIdentifier, boolean isSharableLink, String... params) {
+    public void InitializeRow(String title, String infoText, String debugText, String routingKey, String routingValue, String canonicalIdentifier, boolean isSharableLink, int index, String... params) {
         View view = LayoutInflater.from(getContext()).inflate(R.layout.linking_validator_dialog_row_item, null);
         this.addView(view);
         titleText = view.findViewById(R.id.linkingValidatorRowTitleText);
@@ -84,7 +85,14 @@ public void InitializeRow(String title, String infoText, String debugText, Strin
         } else {
             actionButton.setText("Test");
 
+            if(index == 4) {
+                //warm start use case
 
+            } else if(index == 5) {
+                actionButton.setOnClickListener(view2 -> {
+                    HandleForegroundLinkClick();
+                });
+            }
         }
     }
 
@@ -123,6 +131,16 @@ private void HandleDebugButtonClicked() {
         dialog.show();
     }
 
+    private void HandleForegroundLinkClick() {
+        BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(canonicalIdentifier);
+        LinkProperties lp = new LinkProperties();
+        String branchLink = buo.getShortUrl(context, lp);
+        Intent intent = new Intent(getContext(), getActivity(context).getClass());
+        intent.putExtra("branch", branchLink);
+        intent.putExtra("branch_force_new_session",true);
+        getActivity(context).startActivity(intent);
+    }
+
     public Activity getActivity(Context context) {
         if (context == null) {
             return null;

From 93296e6dd8084337a81cf4dd556e24315dd8a9ce Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Fri, 1 Nov 2024 16:04:00 -0400
Subject: [PATCH 13/14] Added warm start test case logic + some bugfixes

Added warm start test case logic + some bugfixes
---
 .../validators/LinkingValidatorDialog.java    | 40 +++++++++++--------
 .../LinkingValidatorDialogRowItem.java        | 18 ++++++---
 .../res/layout/dialog_linking_validator.xml   |  8 ++--
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index 057322835..a458aaf69 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
@@ -21,18 +21,15 @@ public class LinkingValidatorDialog extends Dialog implements AdapterView.OnItem
 
     private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
     private ROUTING_TYPE routingType;
-    private Button ctaButton;
-    private Spinner linkingValidatorDropdownMenu;
-    private TextView linkingValidatorText;
-    private EditText linkingValidatorEditText;
-    private LinearLayout customKVPField;
-    private LinearLayout linkingValidatorRowsLayout;
+    private final Button ctaButton;
+    private final Spinner linkingValidatorDropdownMenu;
+    private final TextView linkingValidatorText;
+    private final EditText linkingValidatorEditText;
+    private final LinearLayout customKVPField;
+    private final LinearLayout linkingValidatorRowsLayout;
     private int step = 1;
     private String routingKey = "";
     private String routingValue = "";
-    private EditText customKeyEditText;
-    private EditText customValueEditText;
-    private Context context;
     private LinkingValidatorDialogRowItem row1;
     private LinkingValidatorDialogRowItem row2;
     private LinkingValidatorDialogRowItem row3;
@@ -42,7 +39,6 @@ private enum ROUTING_TYPE { CANONICAL_URL, DEEPLINK_PATH, CUSTOM }
 
     public LinkingValidatorDialog(final Context context) {
         super(context);
-        this.context = context;
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         this.setContentView(R.layout.dialog_linking_validator);
 
@@ -59,10 +55,16 @@ public LinkingValidatorDialog(final Context context) {
         ctaButton = findViewById(R.id.linkingValidatorButton);
         ctaButton.setText(LinkingValidatorConstants.step1ButtonText);
         ctaButton.setOnClickListener(view -> {
-            if(step == 1) {
-                LoadStep2Screen();
-            } else {
-                GenerateBranchLinks();
+            switch(step) {
+                case 1:
+                    LoadStep2Screen();
+                    break;
+                case 2:
+                    GenerateBranchLinks();
+                    break;
+                case 3:
+                    CloseDialog();
+                    break;
             }
         });
 
@@ -132,13 +134,15 @@ void LoadStep2Screen() {
     }
 
     void GenerateBranchLinks() {
+        step++;
         linkingValidatorEditText.setVisibility(View.GONE);
+        customKVPField.setVisibility(View.GONE);
         linkingValidatorText.setVisibility(View.GONE);
         ctaButton.setText(LinkingValidatorConstants.step3ButtonText);
         linkingValidatorRowsLayout.setVisibility(View.VISIBLE);
 
-        customKeyEditText = findViewById(R.id.keyEditText);
-        customValueEditText = findViewById(R.id.valueEditText);
+        EditText customKeyEditText = findViewById(R.id.keyEditText);
+        EditText customValueEditText = findViewById(R.id.valueEditText);
 
         //if routing key is empty, it is a custom key outside of $canonical_url and $deeplink_path
         if(routingKey.isEmpty()) {
@@ -153,4 +157,8 @@ void GenerateBranchLinks() {
         row5.InitializeRow(LinkingValidatorConstants.linkingValidatorRow5Title, LinkingValidatorConstants.infoButton5Copy, LinkingValidatorConstants.debugButton5Copy, routingKey, routingValue, "warmStartUseCase", false, 4);
         row6.InitializeRow(LinkingValidatorConstants.linkingValidatorRow6Title, LinkingValidatorConstants.infoButton6Copy, LinkingValidatorConstants.debugButton6Copy, routingKey, routingValue, "foregroundClickUseCase", false, 5);
     }
+
+    private void CloseDialog() {
+        this.dismiss();
+    }
 }
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index 77668058b..1ce9a072a 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
@@ -76,7 +76,7 @@ public void InitializeRow(String title, String infoText, String debugText, Strin
             HandleDebugButtonClicked();
         });
 
-        if(isSharableLink) {
+        if (isSharableLink) {
             actionButton.setText("Share");
 
             actionButton.setOnClickListener(view2 -> {
@@ -85,10 +85,11 @@ public void InitializeRow(String title, String infoText, String debugText, Strin
         } else {
             actionButton.setText("Test");
 
-            if(index == 4) {
-                //warm start use case
-
-            } else if(index == 5) {
+            if (index == 4) {
+                actionButton.setOnClickListener(view2 -> {
+                    HandleWarmStartClick();
+                });
+            } else if (index == 5) {
                 actionButton.setOnClickListener(view2 -> {
                     HandleForegroundLinkClick();
                 });
@@ -131,13 +132,18 @@ private void HandleDebugButtonClicked() {
         dialog.show();
     }
 
+    private void HandleWarmStartClick() {
+        getActivity(context).moveTaskToBack(true);
+        HandleForegroundLinkClick();
+    }
+
     private void HandleForegroundLinkClick() {
         BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(canonicalIdentifier);
         LinkProperties lp = new LinkProperties();
         String branchLink = buo.getShortUrl(context, lp);
         Intent intent = new Intent(getContext(), getActivity(context).getClass());
         intent.putExtra("branch", branchLink);
-        intent.putExtra("branch_force_new_session",true);
+        intent.putExtra("branch_force_new_session", true);
         getActivity(context).startActivity(intent);
     }
 
diff --git a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
index 0693ece31..eb686cec6 100644
--- a/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
+++ b/Branch-SDK/src/main/res/layout/dialog_linking_validator.xml
@@ -47,12 +47,11 @@
         android:id="@+id/linkingValidatorDropdownMenu"
         android:layout_width="351dp"
         android:layout_height="50dp"
-        android:visibility="invisible"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText"
-        tools:visibility="invisible" />
+        app:layout_constraintTop_toBottomOf="@+id/linkingValidatorText" />
 
     <TextView
         android:id="@+id/linkingValidatorText"
@@ -62,7 +61,6 @@
         android:gravity="center"
         android:text="What key do you use for deep link routing?"
         android:textSize="20sp"
-        android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linkingValidatorHeader" />
@@ -146,7 +144,7 @@
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
         android:orientation="vertical"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/linkingValidatorButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 5e1f9f6f3b275eb1cc936ac4600e5fbc26ac60d0 Mon Sep 17 00:00:00 2001
From: rob-gioia-branch <robert.gioia@branch.io>
Date: Tue, 12 Nov 2024 15:17:42 -0500
Subject: [PATCH 14/14] Params bugfixes

Params bugfixes
---
 .../validators/LinkingValidatorDialog.java        | 15 +++++++++++----
 .../validators/LinkingValidatorDialogRowItem.java |  6 ++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
index a458aaf69..9958a4788 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialog.java
+++ b/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);
diff --git a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java b/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
index 1ce9a072a..0c8d961a5 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java
+++ b/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);