Merge remote-tracking branch 'origin/Test-Automation-Improvements' in…

…to SDK-2323

Branch-SDK-Automation-TestBed/build.gradle

@@ -5,8 +5,16 @@ plugins {
 android {
     compileSdk 33
 
+    signingConfigs {
+        debug {
+            keyAlias System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword System.getenv("SIGNING_KEY_PASSWORD")
+            storeFile file("automationSigningKeys.jks")
+            storePassword System.getenv("SIGNING_STORE_PASSWORD")
+        }
+    }
     defaultConfig {
-        applicationId "io.branch.saas.sdk.testbed"
+        applicationId "io.branch.branchandroiddemo"
         minSdk 21
         targetSdk 33
         versionCode 1
@@ -25,7 +33,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    namespace 'io.branch.saas.sdk.testbed'
+    namespace 'io.branch.branchandroiddemo'
 }
 
 dependencies {
@@ -40,4 +48,6 @@ dependencies {
     implementation 'com.intuit.sdp:sdp-android:1.0.6'
 
     implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
+    implementation("com.google.code.gson:gson:2.8.7")
+    implementation 'com.googlecode.json-simple:json-simple:1.1'
 }

Branch-SDK-Automation-TestBed/src/main/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="io.branch.branchandroiddemo"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:name="io.branch.referral.BranchApp"
@@ -16,69 +17,44 @@
             android:name=".activities.ShowQRCodeActivity"
             android:exported="true" />
         <activity
-            android:name=".activities.LogDataActivity"
-            android:exported="true"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activities.TrackContentActivity"
-            android:exported="true"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activities.MetadataActivity"
-            android:exported="true"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activities.UrlPreviewActivity"
+            android:name="io.branch.branchandroiddemo.activities.LogDataActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
 
         <meta-data
             android:name="io.branch.sdk.BranchKey"
-            android:value="key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB" /> <!-- For your test app, if you have one; Again, use your actual test Branch key -->
+            android:value="key_live_fBcbpexoE7Nu1ONlzfl1BilgsFcsZT8T" /> <!-- For your test app, if you have one; Again, use your actual test Branch key -->
         <meta-data
             android:name="io.branch.sdk.BranchKey.test"
-            android:value="key_test_om2EWe1WBeBYmpz9Z1mdpopouDmoN72T" />
+            android:value="key_test_hdcBLUy1xZ1JD0tKg7qrLcgirFmPPVJc" />
         <meta-data
             android:name="io.branch.sdk.TestMode"
-            android:value="true" /> <!-- Set to true to use Branch_Test_Key -->
+            android:value="false" /> <!-- Set to true to use Branch_Test_Key -->
         <activity
-            android:name=".activities.MainActivity"
+            android:name="io.branch.branchandroiddemo.activities.MainActivity"
             android:exported="true"
             android:screenOrientation="portrait">
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-        <activity
-            android:name=".activities.ReadDeepLinkActivity"
-            android:exported="true"
-            android:screenOrientation="portrait">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="timber.test-app.link"
-                    android:scheme="https" />
-                <data
-                    android:host="timber.app.link"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:host="cq9pf.app.link" />
             </intent-filter>
+
+
+            <!-- Branch URI Scheme -->
         </activity>
-        <activity
-            android:name=".activities.GenerateUrlActivity"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".activities.BUOReferenceActivity"
-            android:exported="true"
-            android:screenOrientation="portrait" />
-        <receiver android:name="io.branch.receivers.SharingBroadcastReceiver" android:exported="true">
+        <receiver
+            android:name="io.branch.receivers.SharingBroadcastReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="EXTRA_CHOSEN_COMPONENT" />
             </intent-filter>

Branch-SDK-Automation-TestBed/src/main/java/io/branch/branchandroiddemo/BUOData.java

@@ -0,0 +1,9 @@
+package io.branch.branchandroiddemo;
+
+public class BUOData {
+    public String canonicalIdentifier, contentTitle, contentDesc, imageUrl, productName,
+            productBrand, productVariant, street, city, region, country, postalCode,
+            latitude, longitude, sku, rating, averageRating, maximumRating,
+            ratingCount, imageCaption, quantity, price, customMetadata,
+            contentSchema, currencyType, trackContentData, productCategory, productCondition;
+}

Branch-SDK-Automation-TestBed/src/main/java/io/branch/branchandroiddemo/BranchEventData.java

@@ -0,0 +1,25 @@
+package io.branch.branchandroiddemo;
+
+public class BranchEventData {
+
+    public String eventType;
+    public String event;
+    public String alias;
+    public String transactionId;
+    public String currency;
+    public String revenue;
+    public String shipping;
+    public String tax;
+    public String coupon;
+    public String affiliation;
+    public String description;
+    public String purchaseLocation;
+    public String availability;
+    public String additionalData;
+    public String searchQuery;
+    public String registrationId;
+    public String customEventProperty1;
+    public String customEventProperty2;
+    public String customData1;
+    public String customData2;
+}