Update to support RN 29+ (#21)

* Add support for React Native 29+

* Add instructions for RN 29 to Readme. Update rnpm link in package.json. Add back InAppBillingBridgePackage with no arguments. Update target React Native compilation dependency.

* Use getCurrentActivity method everywhere instead of keeping a reference to an activity.

Author: c-h-

README.md

@@ -43,59 +43,80 @@ With this, [rnpm](https://github.com/rnpm/rnpm) will do most of the heavy liftin
   }
   ```
 
-4. Edit `MainActivity.java`. Step 4.3 is only required if you are using a lower React Native version than 18.0 and/or your `MainActivity` class does not inherit from `ReactActivity`.
-  1. Add `import com.idehub.Billing.InAppBillingBridgePackage;`
-  2. Register package in ReactInstanceManager: `.addPackage(new InAppBillingBridgePackage(this))`
-  3. Override `onActivityResult`:
-  ```java
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        mReactInstanceManager.onActivityResult(requestCode, resultCode, data);
-  }
-  ```
-
-   Larger example:
-
-  ```java
-  // Step 1; import package:
-  import com.idehub.Billing.InAppBillingBridgePackage;
-
-  public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler {
-      ...
-
-      @Override
-      protected void onCreate(Bundle savedInstanceState) {
-          ...
-
-          mReactInstanceManager = ReactInstanceManager.builder()
-                  .setApplication(getApplication())
-                  .setBundleAssetName("index.android.bundle")
-                  .setJSMainModuleName("index.android")
-                  .addPackage(new MainReactPackage())
-                  // Step 2; register package, with your and send in the MainActivity as a parameter (this):
-                  .addPackage(new InAppBillingBridgePackage(this))
-                  .setUseDeveloperSupport(BuildConfig.DEBUG)
-                  .setInitialLifecycleState(LifecycleState.RESUMED)
-                  .build();
-
-          ...
-      }
-      // Step 3: For RN < v0.18, override onActivityResult
-      @Override
-      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+4. Update MainActivity or MainApplication depending on React Native version.
+  - React Native version >= 0.29
+    Edit `MainApplication.java`.
+    1. Add `import com.idehub.Billing.InAppBillingBridgePackage;`
+    2. Register package:
+    ```java
+    @Override
+    protected List<ReactPackage> getPackages() {
+      return Arrays.<ReactPackage>asList(
+        new MainReactPackage(),
+        // add package here
+        new InAppBillingBridgePackage()
+      );
+    }
+    ```
+  - React Native version < 0.29
+    Edit `MainActivity.java`. Step 4.3 is only required if you are using a lower React Native version than 18.0 and/or your `MainActivity` class does not inherit from `ReactActivity`.
+    1. Add `import com.idehub.Billing.InAppBillingBridgePackage;`
+    2. Register package in ReactInstanceManager: `.addPackage(new InAppBillingBridgePackage())`
+    3. Override `onActivityResult`:
+    ```java
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
           mReactInstanceManager.onActivityResult(requestCode, resultCode, data);
-      }
-      ...
-  ```
+    }
+    ```
+
+     Larger example:
+
+    ```java
+    // Step 1; import package:
+    import com.idehub.Billing.InAppBillingBridgePackage;
+
+    public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler {
+        ...
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            ...
+
+            mReactInstanceManager = ReactInstanceManager.builder()
+                    .setApplication(getApplication())
+                    .setBundleAssetName("index.android.bundle")
+                    .setJSMainModuleName("index.android")
+                    .addPackage(new MainReactPackage())
+                    // Step 2; register package
+                    .addPackage(new InAppBillingBridgePackage())
+                    .setUseDeveloperSupport(BuildConfig.DEBUG)
+                    .setInitialLifecycleState(LifecycleState.RESUMED)
+                    .build();
+
+            ...
+        }
+        // Step 3: For RN < v0.18, override onActivityResult
+        @Override
+        protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+            mReactInstanceManager.onActivityResult(requestCode, resultCode, data);
+        }
+        ...
+    ```
 5. Add your Google Play license key as a line to your `android/app/src/main/res/values/strings.xml` with the name `RNB_GOOGLE_PLAY_LICENSE_KEY`. For example:
 ```xml
 <string name="RNB_GOOGLE_PLAY_LICENSE_KEY">YOUR_GOOGLE_PLAY_LICENSE_KEY_HERE</string>
 ```
 Alternatively, you can add your license key as a parameter when registering the `InAppBillingBridgePackage`, like so:
 ```java
-.addPackage(new InAppBillingBridgePackage("YOUR_LICENSE_KEY", this))
+.addPackage(new InAppBillingBridgePackage("YOUR_LICENSE_KEY"))
+```
+or for React Native 29+
+```java
+new InAppBillingBridgePackage("YOUR_LICENSE_KEY")
 ```
 
+
 ## Testing with static responses
 If you want to test with static responses, you can use reserved productids defined by Google. These are:
 * android.test.purchased
@@ -113,7 +134,7 @@ In order to do this send in `null` as parameter, along with your Activity-instan
 [See the Google Play docs for more info on static responses](http://developer.android.com/google/play/billing/billing_testing.html#billing-testing-static).
 
 ## Testing with your own In-app products
-Testing with static responses is limited, because you are only able to test the `purchase` function. Therefore, testing with real In-app products is recommended. But before that is possible, you need to do the following: 
+Testing with static responses is limited, because you are only able to test the `purchase` function. Therefore, testing with real In-app products is recommended. But before that is possible, you need to do the following:
 * I will assume you've already created your Google Play Developer account and an application there.
 * Now you need to create an In-app product under your application at the Google Play Developer Console and activate it (press the button at the top right).
 * Assuming you have installed this module (InApp Billing), you can write the JS code as explained in the Javascript API section. I suggest you to use `getProductDetails` function to see if it's the product is retrieved.
@@ -123,7 +144,7 @@ Testing with static responses is limited, because you are only able to test the
 * The final part is, you'll need to add testers for the channel you've published to. The web page will give you a signup URL (opt-in) after you've approved open testing. Visit this URL in the browser of your **testing device** (it must be a physical device, not a emulator) and signup, and download the app where it redirected.
 * Try to buy something with the device. The purchase will eventually be cancelled, but you can also do this manually through your Google Merchant wallet.
 
-**Important**: You can only test on a physical Android device, not from an emulator. 
+**Important**: You can only test on a physical Android device, not from an emulator.
 
 
 ## Javascript API
@@ -164,7 +185,7 @@ InAppBilling.open()
   * **receiptSignature:** String
   * **receiptData:** String
   * **developerPayload:** String
-  
+
 ```javascript
 InAppBilling.purchase('android.test.purchased')
 .then((details) => {
@@ -198,7 +219,7 @@ InAppBilling.consumePurchase('your.inapp.productid').then(...);
   * **receiptSignature:** String
   * **receiptData:** String
   * **developerPayload:** String
-   
+
 ```javascript
 InAppBilling.subscribe('your.inapp.productid')
 .then((details) => {

android/build.gradle

@@ -13,6 +13,6 @@ android {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.15.+'
+    compile 'com.facebook.react:react-native:+'
     compile 'com.anjlab.android.iab.v3:library:1.0.+'
 }

android/src/main/java/com/idehub/Billing/InAppBillingBridge.java

@@ -26,26 +26,23 @@
 public class InAppBillingBridge extends ReactContextBaseJavaModule implements ActivityEventListener, BillingProcessor.IBillingHandler {
     ReactApplicationContext _reactContext;
     String LICENSE_KEY = null;
-    final Activity _activity;
     BillingProcessor bp;
 
-    public InAppBillingBridge(ReactApplicationContext reactContext, String licenseKey, Activity activity) {
+    public InAppBillingBridge(ReactApplicationContext reactContext, String licenseKey) {
         super(reactContext);
         _reactContext = reactContext;
         LICENSE_KEY = licenseKey;
-        _activity = activity;
 
         reactContext.addActivityEventListener(this);
     }
 
-    public InAppBillingBridge(ReactApplicationContext reactContext, Activity activity) {
+    public InAppBillingBridge(ReactApplicationContext reactContext) {
         super(reactContext);
         _reactContext = reactContext;
         int keyResourceId = _reactContext
                 .getResources()
                 .getIdentifier("RNB_GOOGLE_PLAY_LICENSE_KEY", "string", _reactContext.getPackageName());
         LICENSE_KEY = _reactContext.getString(keyResourceId);
-        _activity = activity;
 
         reactContext.addActivityEventListener(this);
     }
@@ -124,7 +121,7 @@ public void onBillingError(int errorCode, Throwable error) {
     public void purchase(final String productId, final String developerPayload, final Promise promise){
         if (bp != null) {
             if (putPromise(PromiseConstants.PURCHASE_OR_SUBSCRIBE, promise)) {
-                boolean purchaseProcessStarted = bp.purchase(_activity, productId, developerPayload);
+                boolean purchaseProcessStarted = bp.purchase(getCurrentActivity(), productId, developerPayload);
                 if (!purchaseProcessStarted)
                     rejectPromise(PromiseConstants.PURCHASE_OR_SUBSCRIBE, "Could not start purchase process.");
             } else {
@@ -156,7 +153,7 @@ public void consumePurchase(final String productId, final Promise promise) {
     public void subscribe(final String productId, final String developerPayload, final Promise promise){
         if (bp != null) {
             if (putPromise(PromiseConstants.PURCHASE_OR_SUBSCRIBE, promise)) {
-                boolean subscribeProcessStarted = bp.subscribe(_activity, productId, developerPayload);
+                boolean subscribeProcessStarted = bp.subscribe(getCurrentActivity(), productId, developerPayload);
                 if (!subscribeProcessStarted)
                     rejectPromise(PromiseConstants.PURCHASE_OR_SUBSCRIBE, "Could not start subscribe process.");
             } else {

android/src/main/java/com/idehub/Billing/InAppBillingBridgePackage.java

@@ -1,7 +1,5 @@
 package com.idehub.Billing;
 
-import android.app.Activity;
-
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
@@ -14,28 +12,25 @@
 
 public class InAppBillingBridgePackage implements ReactPackage {
 
-    public InAppBillingBridgePackage(String licenseKey, Activity activity) {
+    public InAppBillingBridgePackage(String licenseKey) {
         _licenseKey = licenseKey;
         _licenseKeySetInConstructor = true;
-        _activity = activity;
     }
 
-    public InAppBillingBridgePackage(Activity activity) {
-        _activity = activity;
+    public InAppBillingBridgePackage() {
     }
 
     private String _licenseKey;
     private Boolean _licenseKeySetInConstructor = false;
-    private Activity _activity;
 
     @Override
     public List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
       		if (!_licenseKeySetInConstructor)
-              	modules.add(new InAppBillingBridge(reactContext, _activity));
+              	modules.add(new InAppBillingBridge(reactContext));
       		else
-                modules.add(new InAppBillingBridge(reactContext, _licenseKey, _activity));
+                modules.add(new InAppBillingBridge(reactContext, _licenseKey));
 
           return modules;
     }

package.json

@@ -28,7 +28,7 @@
   "homepage": "https://github.com/idehub/react-native-billing#readme",
   "rnpm": {
     "android": {
-      "packageInstance": "new InAppBillingBridgePackage(this)"
+      "packageInstance": "new InAppBillingBridgePackage()"
     }
   }
 }