BrowserSwitch fixes from PR

wwwdata · HMobileClub · commit 172817b40ad4 · 2024-06-17T11:58:29.000+02:00
pikaju#140
diff --git a/README.md b/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):
diff --git a/android/src/main/java/com/example/flutter_braintree/FlutterBraintreeCustom.java b/android/src/main/java/com/example/flutter_braintree/FlutterBraintreeCustom.java
@@ -1,9 +1,14 @@
 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 com.braintreepayments.api.BraintreeClient;
 import com.braintreepayments.api.Card;
@@ -14,6 +19,7 @@
 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;
@@ -26,14 +32,19 @@ public class FlutterBraintreeCustom extends AppCompatActivity implements PayPalL
     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();
@@ -59,16 +70,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 +114,32 @@ 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"));
+
+            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);
         }
     }
@@ -149,12 +185,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);
         }
-
     }
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/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>
diff --git a/example/android/build.gradle b/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'
     }
 }
 
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -116,8 +116,7 @@ class _MyAppState extends State<MyApp> {
               onPressed: () async {
                 final request = BraintreePayPalRequest(
                   amount: null,
-                  billingAgreementDescription:
-                      'I hereby agree that flutter_braintree is great.',
+                  billingAgreementDescription: 'I hereby agree that flutter_braintree is great.',
                   displayName: 'Your Company',
                 );
                 final result = await Braintree.requestPaypalNonce(
@@ -132,7 +131,10 @@ class _MyAppState extends State<MyApp> {
             ),
             ElevatedButton(
               onPressed: () async {
-                final request = BraintreePayPalRequest(amount: '13.37');
+                final request = BraintreePayPalRequest(
+                  amount: '13.37',
+                  payPalPaymentUserAction: PayPalPaymentUserAction.commit,
+                );
                 final result = await Braintree.requestPaypalNonce(
                   tokenizationKey,
                   request,
diff --git a/example/pubspec.lock b/example/pubspec.lock
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
diff --git a/pubspec.lock b/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:4.1.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:7.4.2'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`