Update Android activities and adding the billing address in the result

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": true
+}

README.md

@@ -33,6 +33,8 @@ dependencies {
 
 #### PayPal / Venmo / 3D Secure
 
+##### With Drop-In
+
 In order for this plugin to support PayPal, Venmo or 3D Secure payments, you must allow for the
 browser switch by adding an intent filter to your `AndroidManifest.xml` (inside the `<application>` body):
 
@@ -53,6 +55,30 @@ browser switch by adding an intent filter to your `AndroidManifest.xml` (inside
 **Important:** Your app's URL scheme must begin with your app's package ID and end with `.braintree`. For example, if the Package ID is `com.your-company.your-app`, then your URL scheme should be `com.your-company.your-app.braintree`. `${applicationId}` is automatically applied with your app's package when using Gradle.
 **Note:** The scheme you define must use all lowercase letters. If your package contains underscores, the underscores should be removed when specifying the scheme in your Android Manifest.
 
+##### Without Drop-In
+
+If you want to use PayPal without Drop-In, you need to declare another intent filter to your `AndroidManifest.xml` (inside the `<application>` body):
+
+```xml
+<activity android:name="com.example.flutter_braintree.FlutterBraintreeCustom"
+    android:theme="@style/bt_transparent_activity" android:exported="true"
+    android:launchMode="singleInstance">
+    <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="${applicationId}.return.from.braintree" />
+    </intent-filter>
+</activity>
+<activity android:name="com.braintreepayments.api.ThreeDSecureActivity" android:theme="@style/Theme.AppCompat.Light" android:exported="true">
+</activity>
+```
+
+Please note that intent filter scheme is different from drop-in's one.
+
+**Important:** Your app's URL scheme must begin with your app's package ID and end with `.return.from.braintree`. For example, if the Package ID is `com.your-company.your-app`, then your URL scheme should be `com.your-company.your-app.return.from.braintree`. `${applicationId}` is automatically applied with your app's package when using Gradle.
+**Note:** The scheme you define must use all lowercase letters. If your package contains underscores, the underscores should be removed when specifying the scheme in your Android Manifest.
+
 #### Google Pay
 
 Add the wallet enabled meta-data tag to your `AndroidManifest.xml` (inside the `<application>` body):

android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_braintree">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity android:name=".DropInActivity"

android/src/main/java/com/example/flutter_braintree/FlutterBraintreeCustom.java

@@ -1,9 +1,16 @@
 package com.example.flutter_braintree;
+import static com.braintreepayments.api.PayPalCheckoutRequest.USER_ACTION_COMMIT;
+import static com.braintreepayments.api.PayPalCheckoutRequest.USER_ACTION_DEFAULT;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import com.braintreepayments.api.BraintreeClient;
 import com.braintreepayments.api.Card;
@@ -14,33 +21,43 @@
 import com.braintreepayments.api.PayPalCheckoutRequest;
 import com.braintreepayments.api.PayPalClient;
 import com.braintreepayments.api.PayPalListener;
+import com.braintreepayments.api.PayPalPaymentIntent;
 import com.braintreepayments.api.PayPalRequest;
 import com.braintreepayments.api.PayPalVaultRequest;
 import com.braintreepayments.api.PaymentMethodNonce;
+import com.braintreepayments.api.PostalAddress;
 import com.braintreepayments.api.UserCanceledException;
 
 
 import java.util.HashMap;
+import java.util.Objects;
 
 public class FlutterBraintreeCustom extends AppCompatActivity implements PayPalListener {
     private BraintreeClient braintreeClient;
     private PayPalClient payPalClient;
     private Boolean started = false;
+    private long creationTimestamp = -1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        creationTimestamp = System.currentTimeMillis();
+
         setContentView(R.layout.activity_flutter_braintree_custom);
         try {
             Intent intent = getIntent();
-            braintreeClient = new BraintreeClient(this, intent.getStringExtra("authorization"));
+            String returnUrlScheme = (getPackageName() + ".return.from.braintree").replace("_", "").toLowerCase();
+            braintreeClient = new BraintreeClient(this, intent.getStringExtra("authorization"), returnUrlScheme);
+
             String type = intent.getStringExtra("type");
             if (type.equals("tokenizeCreditCard")) {
                 tokenizeCreditCard();
             } else if (type.equals("requestPaypalNonce")) {
                 payPalClient = new PayPalClient(this, braintreeClient);
                 payPalClient.setListener(this);
                 requestPaypalNonce();
+
             } else {
                 throw new Exception("Invalid request type: " + type);
             }
@@ -59,16 +76,15 @@ protected void onNewIntent(Intent newIntent) {
         setIntent(newIntent);
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
+//    @Override
+//    protected void onStart() {
+//        super.onStart();
+//    }
 
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
+//    @Override
+//    protected void onResume() {
+//        super.onResume();
+//    }
 
     protected void tokenizeCreditCard() {
         Intent intent = getIntent();
@@ -104,6 +120,53 @@ protected void requestPaypalNonce() {
             // Checkout flow
             PayPalCheckoutRequest checkOutRequest = new PayPalCheckoutRequest(intent.getStringExtra("amount"));
             checkOutRequest.setCurrencyCode(intent.getStringExtra("currencyCode"));
+            checkOutRequest.setDisplayName(intent.getStringExtra("displayName"));
+            checkOutRequest.setBillingAgreementDescription(intent.getStringExtra("billingAgreementDescription"));
+            checkOutRequest.setShouldRequestBillingAgreement(Objects.requireNonNull(intent.getExtras()).getBoolean("requestBillingAgreement"));
+            checkOutRequest.setShippingAddressEditable(Objects.requireNonNull(intent.getExtras()).getBoolean("shippingAddressEditable"));
+            checkOutRequest.setShippingAddressRequired(Objects.requireNonNull(intent.getExtras()).getBoolean("shippingAddressRequired"));
+
+            // handles the shipping address override
+            if (intent.getStringExtra("shippingAddressOverride") != null) {
+                try {
+                    JSONObject obj = new JSONObject(intent.getStringExtra("shippingAddressOverride"));
+                    PostalAddress shippingAddressOverride = new PostalAddress();
+                    shippingAddressOverride.setRecipientName(obj.getString("recipientName"));
+                    shippingAddressOverride.setStreetAddress(obj.getString("streetAddress"));
+                    shippingAddressOverride.setExtendedAddress(obj.getString("extendedAddress"));
+                    shippingAddressOverride.setLocality(obj.getString("locality"));
+                    shippingAddressOverride.setCountryCodeAlpha2(obj.getString("countryCodeAlpha2"));
+                    shippingAddressOverride.setPostalCode(obj.getString("postalCode"));
+                    shippingAddressOverride.setRegion(obj.getString("region"));
+                    checkOutRequest.setShippingAddressOverride(shippingAddressOverride);
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            String userAction;
+            switch (intent.getStringExtra("payPalPaymentUserAction")) {
+                case "commit":
+                    userAction = USER_ACTION_COMMIT;
+                    break;
+                default:
+                    userAction = USER_ACTION_DEFAULT;
+            }
+            checkOutRequest.setUserAction(userAction);
+
+            String paymentIntent;
+            switch (intent.getStringExtra("payPalPaymentIntent")) {
+                case "order":
+                    paymentIntent = PayPalPaymentIntent.ORDER;
+                    break;
+                case "sale":
+                    paymentIntent = PayPalPaymentIntent.SALE;
+                    break;
+                default:
+                    paymentIntent = PayPalPaymentIntent.AUTHORIZE;
+            }
+            checkOutRequest.setIntent(paymentIntent);
+
             payPalClient.tokenizePayPalAccount(this, checkOutRequest);
         }
     }
@@ -117,6 +180,14 @@ public void onPaymentMethodNonceCreated(PaymentMethodNonce paymentMethodNonce) {
             nonceMap.put("paypalPayerId", paypalAccountNonce.getPayerId());
             nonceMap.put("typeLabel", "PayPal");
             nonceMap.put("description", paypalAccountNonce.getEmail());
+
+            nonceMap.put("firstName", paypalAccountNonce.getFirstName());
+            nonceMap.put("lastName", paypalAccountNonce.getLastName());
+            nonceMap.put("email", paypalAccountNonce.getEmail());
+
+            HashMap<String, Object> billingAddressMap = getResultBillingAddress(paypalAccountNonce);
+
+            nonceMap.put("billingAddress", billingAddressMap);
         }else if(paymentMethodNonce instanceof CardNonce){
             CardNonce cardNonce = (CardNonce) paymentMethodNonce;
             nonceMap.put("typeLabel", cardNonce.getCardType());
@@ -129,6 +200,20 @@ public void onPaymentMethodNonceCreated(PaymentMethodNonce paymentMethodNonce) {
         finish();
     }
 
+    @NonNull
+    private static HashMap<String, Object> getResultBillingAddress(PayPalAccountNonce paypalAccountNonce) {
+        PostalAddress btBillingAddress = paypalAccountNonce.getBillingAddress();
+        HashMap<String, Object> billingAddressMap = new HashMap<String, Object>();
+        billingAddressMap.put("recipientName",btBillingAddress.getRecipientName());
+        billingAddressMap.put("streetAddress",btBillingAddress.getStreetAddress());
+        billingAddressMap.put("extendedAddress",btBillingAddress.getExtendedAddress());
+        billingAddressMap.put("locality",btBillingAddress.getLocality());
+        billingAddressMap.put("countryCodeAlpha2",btBillingAddress.getCountryCodeAlpha2());
+        billingAddressMap.put("postalCode",btBillingAddress.getPostalCode());
+        billingAddressMap.put("region",btBillingAddress.getRegion());
+        return billingAddressMap;
+    }
+
     public void onCancel() {
         setResult(RESULT_CANCELED);
         finish();
@@ -149,12 +234,14 @@ public void onPayPalSuccess(@NonNull PayPalAccountNonce payPalAccountNonce) {
     @Override
     public void onPayPalFailure(@NonNull Exception error) {
         if (error instanceof UserCanceledException) {
-            if(((UserCanceledException) error).isExplicitCancelation()){
+            if(((UserCanceledException) error).isExplicitCancelation() || System.currentTimeMillis() - creationTimestamp > 500)
+            {
+                // PayPal sometimes sends a UserCanceledException early for no reason: filter it out
+                // Otherwise take every cancellation event
                 onCancel();
             }
         } else {
             onError(error);
         }
-
     }
 }

android/src/main/java/com/example/flutter_braintree/FlutterBraintreePlugin.java

@@ -5,6 +5,8 @@
 import android.content.Intent;
 
 
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.Map;
 
@@ -108,6 +110,30 @@ public void onMethodCall(MethodCall call, Result result) {
       intent.putExtra("payPalPaymentIntent", (String) request.get("payPalPaymentIntent"));
       intent.putExtra("payPalPaymentUserAction", (String) request.get("payPalPaymentUserAction"));
       intent.putExtra("billingAgreementDescription", (String) request.get("billingAgreementDescription"));
+
+      if(request.containsKey("shippingAddressOverride")){
+        Map shippingAddress = (Map) request.get("shippingAddressOverride");
+        JSONObject shippingAddressJson;
+        shippingAddressJson = new JSONObject();
+        assert shippingAddress != null;
+        try {
+          shippingAddressJson.put("recipientName",shippingAddress.get("recipientName"));
+          shippingAddressJson.put("streetAddress",shippingAddress.get("streetAddress"));
+          shippingAddressJson.put("extendedAddress",shippingAddress.get("extendedAddress"));
+          shippingAddressJson.put("locality",shippingAddress.get("locality"));
+          shippingAddressJson.put("countryCodeAlpha2",shippingAddress.get("countryCodeAlpha2"));
+          shippingAddressJson.put("postalCode",shippingAddress.get("postalCode"));
+          shippingAddressJson.put("region",shippingAddress.get("region"));
+        } catch (JSONException e) {
+          throw new RuntimeException(e);
+        }
+        intent.putExtra("shippingAddressOverride", (String) shippingAddressJson.toString());
+      }
+
+      intent.putExtra("requestBillingAgreement", (Boolean) request.get("requestBillingAgreement"));
+      intent.putExtra("shippingAddressEditable", (Boolean) request.get("shippingAddressEditable"));
+      intent.putExtra("shippingAddressRequired", (Boolean) request.get("shippingAddressRequired"));
+
       activity.startActivityForResult(intent, CUSTOM_ACTIVITY_REQUEST_CODE);
     } else {
       result.notImplemented();

example/.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "example",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "example (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "example (release mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        }
+    ]
+}

example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

example/android/app/src/main/AndroidManifest.xml

@@ -9,11 +9,13 @@
     <application
         android:icon="@mipmap/ic_launcher">
         <activity
-            android:name="io.flutter.embedding.android.FlutterActivity"
+            android:name=".MainActivity"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true"
+            android:launchMode="singleInstance">
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
@@ -22,8 +24,8 @@
                 android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
                 android:value="true" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
@@ -36,15 +38,24 @@
                 <data android:scheme="com.example.flutterbraintreeexample.braintree" />
             </intent-filter>
         </activity>
-        <activity android:name="com.braintreepayments.api.ThreeDSecureActivity" android:exported="true">
+        <activity android:name="com.braintreepayments.api.ThreeDSecureActivity"
+            android:exported="true">
         </activity>
-        <activity android:name="com.example.flutter_braintree.FlutterBraintreeCustom" android:theme="@style/Theme.AppCompat.Light" android:exported="true">
+        <activity android:name="com.example.flutter_braintree.FlutterBraintreeCustom"
+            android:theme="@style/bt_transparent_activity" android:exported="true"
+            android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="com.example.flutterbraintreeexample.return.from.braintree" />
+            </intent-filter>
         </activity>
 
-        <meta-data android:name="com.google.android.gms.wallet.api.enabled" android:value="true"/>
+        <meta-data android:name="com.google.android.gms.wallet.api.enabled" android:value="true" />
 
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-</manifest>
+</manifest>

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }