remove @OverRide onActivityResult in Android

Author: LeowWH

README.md

@@ -13,60 +13,28 @@ This is the beta but functional MOLPay React Native payment module that is ready
 
 - Node.js Version: 5.3.0 ++
 
-- Minimum Android SDK Version: 25 ++
+- Minimum Android SDK Version: 27 ++
 
 - Minimum Android API level: 19 ++
 
 - Minimum Android target version: Android 4.4
 
 - Minimum React Navtive version : 0.47.1 ++
 
-- Xcode version: 7 ++
+- Xcode version: 9 ++
 
-- Minimum target version: iOS 7
+- Minimum target version: iOS 8
 
 ## Installation
 
 ### Android
 
 1) npm install molpay-mobile-xdk-reactnative-beta
 
-2) add the following import to `MainApplication.java` (`MainActivity.java` if RN < 0.33) of your application
+2) add the following code to add the package to `MainApplication.java` (`MainActivity.java` if RN < 0.33)
 
 ```java
-//add these three
-import com.molpayxdk.MOLPayReact;
-import com.molpayxdk.MOLPayReactActivity;
-import android.content.Intent;
-
-public class MainActivity extends ReactActivity {
-    /**
-     * Returns the name of the main component registered from JavaScript.
-     * This is used to schedule rendering of the component.
-     */
-    @Override
-    protected String getMainComponentName() {
-        return "MOLPayReactExampleProject";
-    }
-
-    //add activity result in here
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        if (requestCode == MOLPayReactActivity.MOLPayReactXDK && resultCode == RESULT_OK){
-            if(MOLPayReact.successCallback != null){
-                MOLPayReact.successCallback.invoke(data.getStringExtra(MOLPayReactActivity.MOLPayTransactionResult));
-            }
-        }
-    }
-    
-}
-```
-
-3) add the following code to add the package to `MainApplication.java`` (`MainActivity.java` if RN < 0.33)
-
-```java
-import com.molpayxdk.MOLPayReactPackage;
+import com.molpayxdk.MOLPayReactPackage; //<- this
 
 protected List<ReactPackage> getPackages() {
         return Arrays.<ReactPackage>asList(
@@ -76,7 +44,7 @@ protected List<ReactPackage> getPackages() {
     }
 ```
 
-4) add the following codes to your `android/setting.gradle`
+3) add the following codes to your `android/setting.gradle`
 
 > you might have multiple 3rd party libraries, make sure that you don't create multiple include.
 
@@ -85,13 +53,13 @@ include ':app', ':molpay-mobile-xdk-reactnative-beta'
 project(':molpay-mobile-xdk-reactnative-beta').projectDir = new File(rootProject.projectDir, '../node_modules/molpay-mobile-xdk-reactnative-beta/android')
 ```
 
-5) edit `android/app/build.gradle` and add the following line inside `dependencies`
+4) edit `android/app/build.gradle` and add the following line inside `dependencies`
 
 ```
 compile project(':molpay-mobile-xdk-reactnative-beta')
 ```
 
-6) run `react-native run-android` to see if everything is compilable.
+5) run `react-native run-android` to see if everything is compilable.
 
 if have any issue when run-android please make sure your `android/local.properties` already set sdk path
 
@@ -100,7 +68,7 @@ ndk.dir=path/Android/sdk/ndk-bundle
 sdk.dir=path/Android/sdk
 ```
 
-7) (Optional) header include Close button in payment UI
+6) (Optional) header include Close button in payment UI
 change the following codes in your `android/app/src/main/res/values/styles.xml`
 ```
 <resources>

android/src/main/java/com/molpayxdk/MOLPayReact.java

@@ -5,6 +5,11 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.molpay.molpayxdk.MOLPayActivity;
+import android.content.Intent;
+
+import android.app.Activity;
+import com.facebook.react.bridge.ActivityEventListener;
+import com.facebook.react.bridge.BaseActivityEventListener;
 
 import org.json.JSONObject;
 
@@ -13,11 +18,22 @@
 
 import javax.annotation.Nullable;
 
-public class MOLPayReact extends ReactContextBaseJavaModule{
+public class MOLPayReact extends ReactContextBaseJavaModule {
     public static HashMap<String, Object> paymentDetails;
     public static Callback successCallback;
     public static Callback errorCallback;
 
+      private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
+    @Override
+    public void onActivityResult(final Activity activity,int requestCode, int resultCode, Intent data) {
+        if (requestCode == MOLPayActivity.MOLPayXDK && resultCode == Activity.RESULT_OK){
+            if(successCallback != null){
+                successCallback.invoke(data.getStringExtra(MOLPayActivity.MOLPayTransactionResult));
+            }
+        }
+    }
+  };
+
     @Override
     public String getName() {
         return "MOLPay";
@@ -26,6 +42,7 @@ public String getName() {
 
     public MOLPayReact(ReactApplicationContext reactContext) {
         super(reactContext);
+        reactContext.addActivityEventListener(mActivityEventListener);
     }
 
     @ReactMethod
@@ -56,8 +73,9 @@ public void setPaymentDetails(String str,@Nullable Callback successCallback, @Nu
                 this.errorCallback.invoke(e);
             }
         }
-        MOLPayReactActivity m = new MOLPayReactActivity();
-        m.PaymentUpdated(getCurrentActivity());
+         Intent intent = new Intent(getCurrentActivity(), MOLPayActivity.class);
+        intent.putExtra(MOLPayActivity.MOLPayPaymentDetails, this.paymentDetails);
+        getCurrentActivity().startActivityForResult(intent, MOLPayActivity.MOLPayXDK);
     }
 
 

android/src/main/java/com/molpayxdk/MOLPayReactActivity.java

@@ -1,6 +1,6 @@
 {
   "name": "molpay-mobile-xdk-reactnative-beta",
-  "version": "0.18.3",
+  "version": "0.18.4",
   "description": "MOLPay mobile payment for React Native (BETA)",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"