WIP: Stripe SDK Bump, refactoring

.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 2294d75bfa8d067ba90230c0fc2268f3636d7584
+  channel: beta
+
+project_type: plugin

android/build.gradle

@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70"
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 
@@ -47,6 +47,11 @@ android {
         disable 'InvalidPackage'
     }
 
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
@@ -68,8 +73,8 @@ android {
 }
 
 dependencies {
-    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70'
+    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20'
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.stripe:stripe-android:10.4.6'
-    implementation 'com.google.android.gms:play-services-wallet:18.0.0'
+    implementation 'com.stripe:stripe-android:16.1.1'
+    implementation 'com.google.android.gms:play-services-wallet:18.1.2'
 }

android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.jonasbark.stripepayment">
+    package="de.jonasbark.stripe_payment">
 
     <application
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
@@ -9,24 +9,6 @@
             android:name="com.google.android.gms.wallet.api.enabled"
             android:value="true" />
 
-        <activity
-            android:name="com.gettipsi.stripe.OpenBrowserActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:name="com.gettipsi.stripe.RedirectUriReceiver"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
-            <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="${tipsiStripeRedirectScheme}" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>

android/src/main/java/com/facebook/react/bridge/Promise.java

@@ -1,27 +1,46 @@
 package com.facebook.react.bridge;
 
+import android.os.Handler;
 import io.flutter.plugin.common.MethodChannel;
 
-/**
- * Created by FFuF, Jonas Bark on 2019-10-02.
- */
+/** Created by FFuF, Jonas Bark on 2019-10-02. */
 public class Promise {
 
-    final MethodChannel.Result result;
+  private final MethodChannel.Result result;
 
-    public Promise(MethodChannel.Result result) {
-        this.result = result;
-    }
+  private final Handler handler = new Handler();
 
-    public void resolve(Object result) {
-        this.result.success(result);
-    }
+  private Runnable whenComplete;
+
+  public Promise(MethodChannel.Result result) {
+    this.result = result;
+  }
+
+  public void setWhenComplete(Runnable whenComplete) {
+    this.whenComplete = whenComplete;
+  }
 
-    public void reject(String errorCode, String message) {
-        this.result.error(errorCode, message, null);
+  public void resolve(Object result) {
+    this.result.success(result);
+
+    if (whenComplete != null) {
+      handler.post(whenComplete);
     }
+  }
+
+  public void reject(String errorCode) {
+    reject(errorCode, null, null);
+  }
+
+  public void reject(String errorCode, String message) {
+    reject(errorCode, message, null);
+  }
+
+  public void reject(String errorCode, String message, Object details) {
+    result.error(errorCode, message, details);
 
-    public void reject(String errorCode) {
-        this.reject(errorCode, null);
+    if (whenComplete != null) {
+      handler.post(whenComplete);
     }
+  }
 }

android/src/main/java/com/gettipsi/stripe/Errors.java

@@ -1,19 +1,19 @@
 package com.gettipsi.stripe;
 
+import android.util.Log;
 import androidx.annotation.NonNull;
-
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableMap;
 import com.gettipsi.stripe.util.ArgCheck;
-
+import com.stripe.android.StripeError;
+import com.stripe.android.exception.StripeException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
-/**
- * Created by ngoriachev on 30/07/2018.
- */
-
+/** Created by ngoriachev on 30/07/2018. */
 public final class Errors {
-
+  private static final String TAG = "Errors";
   private static final Map<String, String> exceptionNameToErrorCode = new HashMap<>();
 
   public static final String CANCELLED = "cancelled";
@@ -32,15 +32,53 @@ public final class Errors {
     exceptionNameToErrorCode.put("APIException", "api");
   }
 
+  public static void raiseFlutterError(Exception e, Promise promise) {
+    if (e instanceof StripeException) {
+      final StripeException se = (StripeException) e;
+      final Map<String, Object> details = new HashMap<>();
+
+      String code = e.getClass().toString();
+      if (se.getStripeError() != null) {
+        details.put("stripeError", decode(se.getStripeError()));
+        code = se.getStripeError().getCode();
+      }
+
+      if (se.getRequestId() != null) {
+        details.put("requestId", se.getRequestId());
+      }
+      details.put("statusCode", se.getStatusCode());
+
+      promise.reject(code, e.getMessage(), details);
+    }
+  }
+  private static String toString(Object o, String nullDefault) {
+    return (o != null) ? o.toString() : nullDefault;
+  }
+
+  private static Map<String, Object> decode(StripeError error) {
+    final Map<String, Object> map = new HashMap<>();
+
+    map.put("type", toString(error.getType(), ""));
+    map.put("message", toString(error.getMessage(), ""));
+    map.put("code", toString(error.getCode(), ""));
+    map.put("param", toString(error.getParam(), ""));
+    map.put("declineCode", toString(error.getDeclineCode(), ""));
+    map.put("charge", toString(error.getCharge(), ""));
+    map.put("docUrl", toString(error.getDocUrl(), ""));
+
+    return map;
+  }
+
   public static String toErrorCode(@NonNull Exception exception) {
     ArgCheck.nonNull(exception);
     String simpleName = exception.getClass().getSimpleName();
+    Log.d(TAG, "Simple Error Name: " + simpleName);
     String errorCode = exceptionNameToErrorCode.get(simpleName);
 
     if (errorCode == null) {
       errorCode = simpleName;
     }
-//    ArgCheck.nonNull(errorCode, simpleName);
+    //    ArgCheck.nonNull(errorCode, simpleName);
 
     return errorCode;
   }
@@ -52,5 +90,4 @@ static String getErrorCode(@NonNull ReadableMap errorCodes, @NonNull String erro
   static String getDescription(@NonNull ReadableMap errorCodes, @NonNull String errorKey) {
     return errorCodes.getMap(errorKey).getString("description");
   }
-
 }