react-native-purchases 7.1.0 → 7.3.0

package/RNPurchases.podspec

@@ -24,6 +24,6 @@ Pod::Spec.new do |spec|
   ]
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '7.1.0'
+  spec.dependency   "PurchasesHybridCommon", '7.3.0'
   spec.swift_version    = '5.0'
 end

package/android/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '7.1.0'
+        versionName '7.3.0'
     }
 
     buildTypes {
@@ -121,6 +121,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases-hybrid-common:7.1.0'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:7.3.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

package/android/src/main/java/com/revenuecat/purchases/react/GoogleUpgradeInfo.java

@@ -0,0 +1,19 @@
+package com.revenuecat.purchases.react;
+
+class GoogleUpgradeInfo {
+    private final String oldProductIdentifier;
+    private final Integer prorationMode;
+
+    public GoogleUpgradeInfo(String oldProductIdentifier, Integer prorationMode) {
+        this.oldProductIdentifier = oldProductIdentifier;
+        this.prorationMode = prorationMode;
+    }
+
+    public String getOldProductIdentifier() {
+        return oldProductIdentifier;
+    }
+
+    public Integer getProrationMode() {
+        return prorationMode;
+    }
+}

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java

@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import kotlin.UninitializedPropertyAccessException;
 
@@ -46,7 +45,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     private static final String CUSTOMER_INFO_UPDATED = "Purchases-CustomerInfoUpdated";
     private static final String LOG_HANDLER_EVENT = "Purchases-LogHandlerEvent";
     public static final String PLATFORM_NAME = "react-native";
-    public static final String PLUGIN_VERSION = "7.1.0";
+    public static final String PLUGIN_VERSION = "7.3.0";
 
     private final ReactApplicationContext reactContext;
 
@@ -145,19 +144,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
                                 @Nullable final ReadableMap googleInfo,
                                 @Nullable final String presentedOfferingIdentifier,
                                 final Promise promise) {
-        String googleOldProductId = null;
-        Integer googleProrationMode = null;
-
-        if (googleProductChangeInfo != null) {
-            // GoogleProductChangeInfo in V6 and later
-            googleOldProductId = googleProductChangeInfo.hasKey("oldProductIdentifier") ? googleProductChangeInfo.getString("oldProductIdentifier") : null;
-            googleProrationMode = googleProductChangeInfo.hasKey("prorationMode") ? googleProductChangeInfo.getInt("prorationMode") : null;
-
-            // Legacy UpgradeInfo in V5 and earlier
-            if (googleOldProductId == null) {
-                googleOldProductId = googleProductChangeInfo.hasKey("oldSKU") ? googleProductChangeInfo.getString("oldSKU") : null;
-            }
-        }
+        GoogleUpgradeInfo googleUpgradeInfo = getUpgradeInfo(googleProductChangeInfo);
 
         Boolean googleIsPersonalized = googleInfo != null && googleInfo.hasKey("isPersonalizedPrice") ? googleInfo.getBoolean("isPersonalizedPrice") : null;
 
@@ -166,8 +153,8 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
             productIdentifier,
             type,
             null,
-            googleOldProductId,
-            googleProrationMode,
+            googleUpgradeInfo.getOldProductIdentifier(),
+            googleUpgradeInfo.getProrationMode(),
             googleIsPersonalized,
             presentedOfferingIdentifier,
             getOnResult(promise));
@@ -180,27 +167,16 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
                                 @Nullable final String discountTimestamp,
                                 @Nullable final ReadableMap googleInfo,
                                 final Promise promise) {
-        String googleOldProductId = null;
-        Integer googleProrationMode = null;
+        GoogleUpgradeInfo googleUpgradeInfo = getUpgradeInfo(googleProductChangeInfo);
 
-        if (googleProductChangeInfo != null) {
-            // GoogleProductChangeInfo in V6 and later
-            googleOldProductId = googleProductChangeInfo.hasKey("oldProductIdentifier") ? googleProductChangeInfo.getString("oldProductIdentifier") : null;
-            googleProrationMode = googleProductChangeInfo.hasKey("prorationMode") ? googleProductChangeInfo.getInt("prorationMode") : null;
-
-            // Legacy UpgradeInfo in V5 and earlier
-            if (googleOldProductId == null) {
-                googleOldProductId = googleProductChangeInfo.hasKey("oldSKU") ? googleProductChangeInfo.getString("oldSKU") : null;
-            }
-        }
         Boolean googleIsPersonalized = googleInfo != null && googleInfo.hasKey("isPersonalizedPrice") ? googleInfo.getBoolean("isPersonalizedPrice") : null;
 
         CommonKt.purchasePackage(
             getCurrentActivity(),
             packageIdentifier,
             offeringIdentifier,
-            googleOldProductId,
-            googleProrationMode,
+            googleUpgradeInfo.getOldProductIdentifier(),
+            googleUpgradeInfo.getProrationMode(),
             googleIsPersonalized,
             getOnResult(promise));
     }
@@ -213,8 +189,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
                                            @Nullable final ReadableMap googleInfo,
                                            @Nullable final String presentedOfferingIdentifier,
                                            final Promise promise) {
-        String googleOldProductId = upgradeInfo != null && upgradeInfo.hasKey("oldSKU") ? upgradeInfo.getString("oldSKU") : null;
-        Integer googleProrationMode = upgradeInfo != null && upgradeInfo.hasKey("prorationMode") ? upgradeInfo.getInt("prorationMode") : null;
+        GoogleUpgradeInfo googleUpgradeInfo = getUpgradeInfo(upgradeInfo);
 
         Boolean googleIsPersonalized = googleInfo != null && googleInfo.hasKey("isPersonalizedPrice") ? googleInfo.getBoolean("isPersonalizedPrice") : null;
 
@@ -222,8 +197,8 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
             getCurrentActivity(),
             productIdentifer,
             optionIdentifier,
-            googleOldProductId,
-            googleProrationMode,
+            googleUpgradeInfo.getOldProductIdentifier(),
+            googleUpgradeInfo.getProrationMode(),
             googleIsPersonalized,
             presentedOfferingIdentifier,
             getOnResult(promise));
@@ -514,4 +489,21 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
         };
     }
 
+    private static GoogleUpgradeInfo getUpgradeInfo(ReadableMap upgradeInfo) {
+        String googleOldProductId = null;
+        Integer googleProrationMode = null;
+
+        if (upgradeInfo != null) {
+            // GoogleProductChangeInfo in V6 and later
+            googleOldProductId = upgradeInfo.hasKey("oldProductIdentifier") ? upgradeInfo.getString("oldProductIdentifier") : null;
+            googleProrationMode = upgradeInfo.hasKey("prorationMode") ? upgradeInfo.getInt("prorationMode") : null;
+
+            // Legacy UpgradeInfo in V5 and earlier
+            if (googleOldProductId == null) {
+                googleOldProductId = upgradeInfo.hasKey("oldSKU") ? upgradeInfo.getString("oldSKU") : null;
+            }
+        }
+
+        return new GoogleUpgradeInfo(googleOldProductId, googleProrationMode);
+    }
 }

package/ios/RNPurchases.m

@@ -470,7 +470,7 @@ readyForPromotedProduct:(RCStoreProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"7.1.0";
+    return @"7.3.0";
 }
 
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-purchases",
   "title": "React Native Purchases",
-  "version": "7.1.0",
+  "version": "7.3.0",
   "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android. ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -95,6 +95,6 @@
     ]
   },
   "dependencies": {
-    "@revenuecat/purchases-typescript-internal": "7.1.0"
+    "@revenuecat/purchases-typescript-internal": "7.3.0"
   }
 }

package/scripts/docs/index.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/7.1.0/" />
+	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/7.3.0/" />
 </head>
 <body>
 </body>