Merge Main into v5

.github/workflows/release.yml

@@ -114,6 +114,30 @@ jobs:
         uses: ./.github/actions/unit_test_module
         with:
           module: PayPal
+  unit_test_paypal_messaging:
+    name: PayPal Messaging Unit Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Setup Java 8
+        uses: ./.github/actions/setup
+      - name: Run Unit Tests
+        uses: ./.github/actions/unit_test_module
+        with:
+          module: PayPalMessaging
+  unit_test_shopper_insights:
+    name: Shopper Insights Unit Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Setup Java 8
+        uses: ./.github/actions/setup
+      - name: Run Unit Tests
+        uses: ./.github/actions/unit_test_module
+        with:
+          module: ShopperInsights
   unit_test_three_d_secure:
     name: ThreeDSecure Unit Tests
     runs-on: ubuntu-latest
@@ -173,6 +197,8 @@ jobs:
       unit_test_google_pay,
       unit_test_local_payment,
       unit_test_paypal,
+      unit_test_paypal_messaging,
+      unit_test_shopper_insights,
       unit_test_three_d_secure,
       unit_test_venmo,
       unit_test_visa_checkout,

.github/workflows/release_snapshot.yml

@@ -114,6 +114,30 @@ jobs:
         uses: ./.github/actions/unit_test_module
         with:
           module: PayPal
+  unit_test_paypal_messaging:
+    name: PayPal Messaging Unit Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Setup Java 8
+        uses: ./.github/actions/setup
+      - name: Run Unit Tests
+        uses: ./.github/actions/unit_test_module
+        with:
+          module: PayPalMessaging
+  unit_test_shopper_insights:
+    name: Shopper Insights Unit Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Setup Java 8
+        uses: ./.github/actions/setup
+      - name: Run Unit Tests
+        uses: ./.github/actions/unit_test_module
+        with:
+          module: ShopperInsights
   unit_test_three_d_secure:
     name: ThreeDSecure Unit Tests
     runs-on: ubuntu-latest
@@ -173,6 +197,8 @@ jobs:
       unit_test_google_pay,
       unit_test_local_payment,
       unit_test_paypal,
+      unit_test_paypal_messaging,
+      unit_test_shopper_insights,
       unit_test_three_d_secure,
       unit_test_venmo,
       unit_test_visa_checkout,

BraintreeCore/build.gradle

@@ -94,6 +94,7 @@ dependencies {
     testImplementation deps.mockitoCore
     testImplementation deps.jsonAssert
     testImplementation deps.mockk
+    testImplementation deps.kotlinTest
     testImplementation project(':PayPal')
     testImplementation project(':TestUtils')
     testImplementation project(':Venmo')

BraintreeCore/schemas/com.braintreepayments.api.core.AnalyticsDatabase/4.json

@@ -0,0 +1,65 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "aea9bd6b15fd0bdcccc15f2ee9ed326a",
+    "entities": [
+      {
+        "tableName": "analytics_event",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `paypal_context_id` TEXT, `link_type` TEXT, `timestamp` INTEGER NOT NULL, `venmo_installed` INTEGER NOT NULL DEFAULT 0, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "payPalContextId",
+            "columnName": "paypal_context_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "linkType",
+            "columnName": "link_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "venmoInstalled",
+            "columnName": "venmo_installed",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'aea9bd6b15fd0bdcccc15f2ee9ed326a')"
+    ]
+  }
+}

BraintreeCore/schemas/com.braintreepayments.api.core.AnalyticsDatabase/5.json

@@ -0,0 +1,72 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "be2819613b2d28975a74cd80ed788cd5",
+    "entities": [
+      {
+        "tableName": "analytics_event",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `paypal_context_id` TEXT, `link_type` TEXT, `timestamp` INTEGER NOT NULL, `venmo_installed` INTEGER NOT NULL DEFAULT 0, `is_vault` INTEGER NOT NULL DEFAULT 0, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "payPalContextId",
+            "columnName": "paypal_context_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "linkType",
+            "columnName": "link_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "venmoInstalled",
+            "columnName": "venmo_installed",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isVault",
+            "columnName": "is_vault",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'be2819613b2d28975a74cd80ed788cd5')"
+    ]
+  }
+}

BraintreeCore/src/androidTest/java/com/braintreepayments/api/core/AnalyticsClientTest.java

@@ -41,8 +41,8 @@ public void setUp() {
     public void sendsCorrectlyFormattedAnalyticsRequestToWorkManager() throws Exception {
         Authorization authorization = Authorization.fromString(Fixtures.TOKENIZATION_KEY);
         Configuration configuration = Configuration.fromJson(Fixtures.CONFIGURATION_WITH_ENVIRONMENT);
-
-        AnalyticsEvent event = new AnalyticsEvent("event.started", null, null, 123);
+        
+        AnalyticsEvent event = new AnalyticsEvent("event.started", null, null, 123, false, false);
 
         AnalyticsClient sut = new AnalyticsClient(context);
         UUID workSpecId = sut.sendEvent(configuration, event, "sessionId", "custom", authorization);

BraintreeCore/src/main/java/com/braintreepayments/api/ExperimentalBetaApi.kt

@@ -0,0 +1,8 @@
+package com.braintreepayments.api
+
+/**
+ * The annotated method or class is in beta. It's public API may change or be removed in future releases.
+ */
+@RequiresOptIn
+@Retention(AnnotationRetention.BINARY)
+annotation class ExperimentalBetaApi

BraintreeCore/src/main/java/com/braintreepayments/api/core/AnalyticsClient.kt

@@ -49,6 +49,8 @@ internal class AnalyticsClient @VisibleForTesting constructor(
             .putString(WORK_INPUT_KEY_PAYPAL_CONTEXT_ID, event.payPalContextId)
             .putString(WORK_INPUT_KEY_LINK_TYPE, event.linkType)
             .putLong(WORK_INPUT_KEY_TIMESTAMP, event.timestamp)
+            .putBoolean(WORK_INPUT_KEY_VENMO_INSTALLED, event.venmoInstalled)
+            .putBoolean(WORK_INPUT_KEY_IS_VAULT_REQUEST, event.isVaultRequest)
             .build()
 
         val analyticsWorkRequest =
@@ -65,11 +67,20 @@ internal class AnalyticsClient @VisibleForTesting constructor(
         val payPalContextId = inputData.getString(WORK_INPUT_KEY_PAYPAL_CONTEXT_ID)
         val linkType = inputData.getString(WORK_INPUT_KEY_LINK_TYPE)
         val timestamp = inputData.getLong(WORK_INPUT_KEY_TIMESTAMP, INVALID_TIMESTAMP)
+        val venmoInstalled = inputData.getBoolean(WORK_INPUT_KEY_VENMO_INSTALLED, false)
+        val isVaultRequest = inputData.getBoolean(WORK_INPUT_KEY_IS_VAULT_REQUEST, false)
 
         return if (eventName == null || timestamp == INVALID_TIMESTAMP) {
             ListenableWorker.Result.failure()
         } else {
-            val event = AnalyticsEvent(eventName, payPalContextId, linkType, timestamp)
+            val event = AnalyticsEvent(
+                eventName,
+                payPalContextId,
+                linkType,
+                timestamp,
+                venmoInstalled,
+                isVaultRequest
+            )
             val analyticsEventDao = analyticsDatabase.analyticsEventDao()
             analyticsEventDao.insertEvent(event)
             ListenableWorker.Result.success()
@@ -159,11 +170,11 @@ internal class AnalyticsClient @VisibleForTesting constructor(
         try {
             val analyticsRequest = serializeEvents(authorization, events, metadata)
             httpClient.post(
-                FPTI_ANALYTICS_URL,
-                analyticsRequest.toString(),
-                null,
-                authorization,
-                HttpNoResponse()
+                path = FPTI_ANALYTICS_URL,
+                data = analyticsRequest.toString(),
+                configuration = null,
+                authorization = authorization,
+                callback = HttpNoResponse()
             )
         } catch (e: JSONException) { /* ignored */
         }
@@ -195,6 +206,8 @@ internal class AnalyticsClient @VisibleForTesting constructor(
                 .putOpt(PAYPAL_CONTEXT_ID_KEY, analyticsEvent.payPalContextId)
                 .putOpt(LINK_TYPE_KEY, analyticsEvent.linkType)
                 .put(TIMESTAMP_KEY, analyticsEvent.timestamp)
+                .put(VENMO_INSTALLED_KEY, analyticsEvent.venmoInstalled)
+                .put(IS_VAULT_REQUEST_KEY, analyticsEvent.isVaultRequest)
                 .put(TENANT_NAME_KEY, "Braintree")
             eventParamsJSON.put(singleEventJSON)
         }
@@ -208,6 +221,8 @@ internal class AnalyticsClient @VisibleForTesting constructor(
     companion object {
         private const val FPTI_ANALYTICS_URL = "https://api-m.paypal.com/v1/tracking/batch/events"
         private const val PAYPAL_CONTEXT_ID_KEY = "paypal_context_id"
+        private const val VENMO_INSTALLED_KEY = "venmo_installed"
+        private const val IS_VAULT_REQUEST_KEY = "is_vault"
         private const val LINK_TYPE_KEY = "link_type"
         private const val TOKENIZATION_KEY = "tokenization_key"
 
@@ -229,6 +244,8 @@ internal class AnalyticsClient @VisibleForTesting constructor(
         const val WORK_INPUT_KEY_SESSION_ID = "sessionId"
         const val WORK_INPUT_KEY_TIMESTAMP = "timestamp"
         const val WORK_INPUT_KEY_PAYPAL_CONTEXT_ID = "payPalContextId"
+        const val WORK_INPUT_KEY_VENMO_INSTALLED = "venmoInstalled"
+        const val WORK_INPUT_KEY_IS_VAULT_REQUEST = "isVaultRequest"
         const val WORK_INPUT_KEY_LINK_TYPE = "linkType"
         private const val DELAY_TIME_SECONDS = 30L
 

BraintreeCore/src/main/java/com/braintreepayments/api/core/AnalyticsDatabase.kt

@@ -8,11 +8,13 @@ import androidx.room.RoomDatabase
 
 // Ref: https://developer.android.com/training/data-storage/room/migrating-db-versions
 @Database(
-        version = 3,
+        version = 5,
         entities = [AnalyticsEvent::class],
         autoMigrations = [
-            AutoMigration(from = 1, to = 3),
-            AutoMigration(from = 2, to = 3)
+            AutoMigration(from = 1, to = 2),
+            AutoMigration(from = 2, to = 3),
+            AutoMigration(from = 3, to = 4),
+            AutoMigration(from = 4, to = 5)
         ]
 )
 internal abstract class AnalyticsDatabase : RoomDatabase() {

BraintreeCore/src/main/java/com/braintreepayments/api/core/AnalyticsEvent.kt

@@ -20,7 +20,13 @@ open class AnalyticsEvent internal constructor(
     @ColumnInfo(name = "link_type")
     open val linkType: String? = null,
 
-    open val timestamp: Long = System.currentTimeMillis()
+    open val timestamp: Long = System.currentTimeMillis(),
+
+    @ColumnInfo(name = "venmo_installed", defaultValue = "0")
+    open val venmoInstalled: Boolean = false,
+
+    @ColumnInfo(name = "is_vault", defaultValue = "0")
+    open val isVaultRequest: Boolean = false
 ) {
     @JvmField
     @PrimaryKey(autoGenerate = true)

BraintreeCore/src/main/java/com/braintreepayments/api/core/ApiClient.kt

@@ -33,17 +33,18 @@ class ApiClient(private val braintreeClient: BraintreeClient) {
             paymentMethod.setSessionId(braintreeClient.sessionId)
 
             sendAnalyticsEvent("card.rest.tokenization.started")
-            sendPOST(url, paymentMethod.buildJSON().toString(), object : HttpResponseCallback {
-                override fun onResult(responseBody: String?, httpError: Exception?) {
-                    parseResponseToJSON(responseBody)?.let { json ->
-                        sendAnalyticsEvent("card.rest.tokenization.success")
-                        callback.onResult(json, null)
-                    } ?: httpError?.let { error ->
-                        sendAnalyticsEvent("card.rest.tokenization.failure")
-                        callback.onResult(null, error)
-                    }
+            sendPOST(
+                url = url,
+                data = paymentMethod.buildJSON().toString(),
+            ) { responseBody, httpError ->
+                parseResponseToJSON(responseBody)?.let { json ->
+                    sendAnalyticsEvent("card.rest.tokenization.success")
+                    callback.onResult(json, null)
+                } ?: httpError?.let { error ->
+                    sendAnalyticsEvent("card.rest.tokenization.failure")
+                    callback.onResult(null, error)
                 }
-            })
+            }
         }
 
     private fun parseResponseToJSON(responseBody: String?): JSONObject? =