Merge pull request #10 from Feedpresso/master

Using BaseActivityEventListener instead of ActivityEventListener

Author: rstrobl

src/main/java/com/surialabs/rn/braintree/Braintree.java

@@ -1,38 +1,35 @@
 package com.surialabs.rn.braintree;
 
-import android.content.Intent;
-import android.content.Context;
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 
-import com.braintreepayments.api.PaymentRequest;
-import com.braintreepayments.api.models.PaymentMethodNonce;
-import com.braintreepayments.api.BraintreePaymentActivity;
 import com.braintreepayments.api.BraintreeFragment;
-import com.braintreepayments.api.exceptions.InvalidArgumentException;
-import com.braintreepayments.api.models.CardBuilder;
+import com.braintreepayments.api.BraintreePaymentActivity;
 import com.braintreepayments.api.Card;
+import com.braintreepayments.api.PaymentRequest;
+import com.braintreepayments.api.exceptions.InvalidArgumentException;
 import com.braintreepayments.api.interfaces.PaymentMethodNonceCreatedListener;
-
+import com.braintreepayments.api.models.CardBuilder;
+import com.braintreepayments.api.models.PaymentMethodNonce;
+import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ActivityEventListener;
 
-public class Braintree extends ReactContextBaseJavaModule implements ActivityEventListener {
+public class Braintree extends ReactContextBaseJavaModule {
   private static final int PAYMENT_REQUEST = 1;
   private String token;
 
   private Callback successCallback;
   private Callback errorCallback;
 
-  private Context mActivityContext;
-
   private BraintreeFragment mBraintreeFragment;
 
   public Braintree(ReactApplicationContext reactContext) {
     super(reactContext);
-    reactContext.addActivityEventListener(this);
+    reactContext.addActivityEventListener(new BraintreeActivityListener());
   }
 
   @Override
@@ -96,31 +93,28 @@ public void paymentRequest(final Callback successCallback, final Callback errorC
     );
   }
 
-  @Override
-  public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
-    if (requestCode == PAYMENT_REQUEST) {
-      switch (resultCode) {
-        case Activity.RESULT_OK:
-          PaymentMethodNonce paymentMethodNonce = data.getParcelableExtra(
-            BraintreePaymentActivity.EXTRA_PAYMENT_METHOD_NONCE
-          );
-          this.successCallback.invoke(paymentMethodNonce.getNonce());
-          break;
-        case BraintreePaymentActivity.BRAINTREE_RESULT_DEVELOPER_ERROR:
-        case BraintreePaymentActivity.BRAINTREE_RESULT_SERVER_ERROR:
-        case BraintreePaymentActivity.BRAINTREE_RESULT_SERVER_UNAVAILABLE:
-          this.errorCallback.invoke(
-            data.getSerializableExtra(BraintreePaymentActivity.EXTRA_ERROR_MESSAGE)
-          );
-          break;
-        default:
-          break;
+  private class BraintreeActivityListener extends BaseActivityEventListener {
+    @Override
+    public void onActivityResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
+      if (requestCode == PAYMENT_REQUEST) {
+        switch (resultCode) {
+          case Activity.RESULT_OK:
+            PaymentMethodNonce paymentMethodNonce = data.getParcelableExtra(
+                    BraintreePaymentActivity.EXTRA_PAYMENT_METHOD_NONCE
+            );
+            successCallback.invoke(paymentMethodNonce.getNonce());
+            break;
+          case BraintreePaymentActivity.BRAINTREE_RESULT_DEVELOPER_ERROR:
+          case BraintreePaymentActivity.BRAINTREE_RESULT_SERVER_ERROR:
+          case BraintreePaymentActivity.BRAINTREE_RESULT_SERVER_UNAVAILABLE:
+            errorCallback.invoke(
+                    data.getSerializableExtra(BraintreePaymentActivity.EXTRA_ERROR_MESSAGE)
+            );
+            break;
+          default:
+            break;
+        }
       }
     }
   }
-
-  @Override
-  public void onNewIntent(Intent intent){
-    
-  }
 }