fix: key formating android

RevenueCat · Mar 31, 2022 · 48b2a98 · 48b2a98
1 parent 7dc32c9
commit 48b2a98
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -60,6 +60,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "androidx.core:core-ktx:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "com.google.guava:guava:31.1-android"
     implementation "com.revenuecat.purchases:purchases:4.6.1"
     implementation "com.revenuecat.purchases:purchases-hybrid-common:2.0.1"
 }
diff --git a/android/src/main/java/ee/forgr/plugin/capacitor_purchases/CapacitorPurchasesPlugin.java b/android/src/main/java/ee/forgr/plugin/capacitor_purchases/CapacitorPurchasesPlugin.java
@@ -10,6 +10,7 @@
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
+import com.google.common.base.CaseFormat;
 import com.revenuecat.purchases.PurchaserInfo;
 import com.revenuecat.purchases.Purchases;
 
@@ -132,24 +133,25 @@ private static JSObject convertMapToJson(Map<String, ?> readableMap) {
         JSObject object = new JSObject();
 
         for (Map.Entry<String, ?> entry : readableMap.entrySet()) {
+            String camelKey = entry.getKey().contains("_") ? CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, entry.getKey()) : entry.getKey();
             if (entry.getValue() == null) {
-                object.put(entry.getKey(), JSONObject.NULL);
+                object.put(camelKey, JSONObject.NULL);
             } else if (entry.getValue() instanceof Map) {
-                object.put(entry.getKey(), convertMapToJson((Map<String, Object>) entry.getValue()));
+                object.put(camelKey, convertMapToJson((Map<String, Object>) entry.getValue()));
             } else if (entry.getValue() instanceof Object[]) {
-                object.put(entry.getKey(), convertArrayToJsonArray((Object[]) entry.getValue()));
+                object.put(camelKey, convertArrayToJsonArray((Object[]) entry.getValue()));
             } else if (entry.getValue() instanceof List) {
-                object.put(entry.getKey(), convertArrayToJsonArray(((List) entry.getValue()).toArray()));
+                object.put(camelKey, convertArrayToJsonArray(((List) entry.getValue()).toArray()));
             } else if (entry.getValue() != null) {
                 Object value = entry.getValue();
-                if (entry.getKey() == "price_string") {
+                if (camelKey == "priceString") {
                     String currency_symbol = ((String) value).replaceAll("\\d","").replace(".","").replace(",","");
                     object.put("currencySymbol", currency_symbol);
                 }
-                if (entry.getKey() == "title") {
+                if (camelKey == "title") {
                     value = ((String) value).replace("(" + AppName + ")", "");
                 }
-                object.put(entry.getKey(), value);
+                object.put(camelKey, value);
             }
         }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-purchases",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "In-app Subscriptions Made Easy with RevenueCat sdk",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",