@woosmap/react-native-plugin-geofencing 0.12.3 → 0.13.1

package/CHANGELOG.md

@@ -1,4 +1,6 @@
-## 0.12.3
+## 0.13.1
+- Patch: Remove deprecation warnings in the Android plugin.
+## 0.13.0
 - Bug: Resolved bug in Airship connector
 
 ## 0.12.2

package/android/src/main/java/com/reactnativeplugingeofencing/AirshipPushHelper.java

@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.TimeZone;
 import org.json.JSONException;
 import org.json.JSONObject;
+import com.google.gson.Gson;
 
 public class AirshipPushHelper implements AbstractPushHelper {
   SimpleDateFormat displayDateFormatAirship;
@@ -40,23 +41,38 @@ public class AirshipPushHelper implements AbstractPushHelper {
         String key;
         Class type;
         for (Map.Entry<String, Object> entry : data.entrySet()) {
-          key = entry.getKey();
-          keyData = entry.getValue();
-          type = keyData.getClass();
-          if (type.getName().equals("java.lang.Double")){
-            type = double.class;
-          }
-          if (type.getName().equals("java.lang.Integer")){
-            type = int.class;
-          }
-          if (type.getName().equals("java.lang.Boolean")){
-            type = boolean.class;
+          try{
+              key = entry.getKey();
+              keyData = entry.getValue();
+              if (keyData == null){
+                  keyData = "";
+              }
+              type = keyData.getClass();
+              if (type.getName().equals("java.lang.Double")){
+                  type = double.class;
+              }
+              else if (type.getName().equals("java.lang.Integer")){
+                  type = int.class;
+              }
+              else if (type.getName().equals("java.lang.Boolean")){
+                  type = boolean.class;
+              }
+              else if (type.getName().equals("java.lang.Long")){
+                  type = long.class;
+              }
+              else if (type.getName().equals("com.google.gson.internal.LinkedTreeMap")) {
+                  type = String.class;
+                  keyData = new Gson().toJson(keyData);
+              } else {
+                  type = String.class;
+                  keyData = keyData.toString();
+              }
+              addProp = builderClass.getMethod("addProperty", String.class, type);
+              addProp.invoke(builderInstance,key, keyData);
           }
-          if (type.getName().equals("java.lang.Long")){
-            type = long.class;
+          catch (Exception ex){
+              Log.e(TAG, ex.toString());
           }
-          addProp = builderClass.getMethod("addProperty", String.class, type);
-          addProp.invoke(builderInstance,key, keyData);
         }
 
         Method build = builderClass.getMethod("build");
@@ -69,9 +85,9 @@ public class AirshipPushHelper implements AbstractPushHelper {
             con.setAccessible(true);
             Object eventInstance = con.newInstance(builderInstance);
             Method track = eventClass.getMethod("track");
-            Object trackResult = track.invoke(eventInstance);
+            track.invoke(eventInstance);
             Log.d(TAG,"event tracked");
-            continue;
+            break;
           }
           catch (Exception ex) {
             Log.e(TAG, ex.toString());
@@ -105,9 +121,7 @@ public class AirshipPushHelper implements AbstractPushHelper {
       POI poi = this.db.getPOIsDAO().getPOIbyStoreId(regionLog.idStore);
       if (poi != null) {
         HashMap<String, Object> poiData = setDataAirshipPOI(poi);
-        if (poiData != null) {
-          data.putAll(poiData);
-        }
+        data.putAll(poiData);
       }
       data.put("date", displayDateFormatAirship.format(regionLog.dateTime));
       data.put("event", eventName);
@@ -135,7 +149,7 @@ public class AirshipPushHelper implements AbstractPushHelper {
     if (!"null".equals(POIaround.countryCode)) {
       data.put("country_code", POIaround.countryCode);
     }
-    data.put("openNow", POIaround.openNow);
+    data.put("openNow", POIaround.openNow());
 
     // User Properties
     try {
@@ -147,7 +161,7 @@ public class AirshipPushHelper implements AbstractPushHelper {
         }
       }
     } catch (JSONException e) {
-      e.printStackTrace();
+      Log.e(TAG, e.toString());
     }
 
     return data;

package/android/src/main/java/com/reactnativeplugingeofencing/PluginGeofencingModule.java

@@ -255,7 +255,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
         promise.reject(WoosmapMessageAndKey.errorCode, WoosmapMessageAndKey.permissionValueNotProvided);
       }
       boolean isBackground = data.getBoolean(0);
-      PermissionAwareActivity activity = (PermissionAwareActivity) getCurrentActivity();
+      PermissionAwareActivity activity = (PermissionAwareActivity) getReactApplicationContext().getCurrentActivity();
       mPermissionsRequestPromise = promise;
       if (activity != null) {
         if (Build.VERSION.SDK_INT >= 23) {
@@ -281,7 +281,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
       if (promise == null) {
         return;
       }
-      PermissionAwareActivity activity = (PermissionAwareActivity) getCurrentActivity();
+      PermissionAwareActivity activity = (PermissionAwareActivity) getReactApplicationContext().getCurrentActivity();
       if (activity == null) {
         promise.resolve(WoosmapMessageAndKey.unknownMessage);
         return;
@@ -323,7 +323,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
     if (promise == null) {
       return;
     }
-    Activity activity = getCurrentActivity();
+    Activity activity = getReactApplicationContext().getCurrentActivity();
     if (activity == null) {
       promise.resolve(WoosmapMessageAndKey.unknownMessage);
       return;
@@ -361,7 +361,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
       if (promise == null) {
         return;
       }
-      Activity activity = getCurrentActivity();
+      Activity activity = getReactApplicationContext().getCurrentActivity();
       if (activity == null) {
         promise.resolve(WoosmapMessageAndKey.unknownMessage);
         return;
@@ -419,7 +419,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
    */
   private boolean hasPermission(boolean isBackground) {
     try {
-      Activity activity = getCurrentActivity();
+      Activity activity = getReactApplicationContext().getCurrentActivity();
       if (activity == null) {
         return false;
       }
@@ -1116,7 +1116,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
   private void provideNotificationPermissionStatus(final Promise promise) {
     if (promise == null) return;
 
-    Activity activity = getCurrentActivity();
+    Activity activity = getReactApplicationContext().getCurrentActivity();
     if (activity == null) {
       promise.resolve(WoosmapMessageAndKey.unknownMessage);
       return;
@@ -1163,7 +1163,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
   @ReactMethod
   public void requestNotificationPermissions(final Promise promise) {
     try {
-      Activity activity = getCurrentActivity();
+      Activity activity = getReactApplicationContext().getCurrentActivity();
       if (activity == null) {
         promise.resolve(WoosmapMessageAndKey.unknownMessage);
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woosmap/react-native-plugin-geofencing",
-  "version": "0.12.3",
+  "version": "0.13.1",
   "description": "This react-native plugin extends the functionality offered by the Woosmap Geofencing Mobile SDKs. Find more about the Woosmap Geofencing SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-plugin-geofencing.podspec

@@ -59,6 +59,7 @@ Pod::Spec.new do |s|
     spec.dependency "WoosmapGeofencing"
   end
   s.subspec "Airship" do |spec|
+    spec.platforms    = { :ios => "16.0" }
     spec.dependency "AirshipFrameworkProxy"
   end   
 end