npm - react-native-mapp-plugin - Versions diffs - 1.0.11-beta3 → 1.0.11-beta4 - Mend

react-native-mapp-plugin 1.0.11-beta3 → 1.0.11-beta4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/.idea/workspace.xml +5 -2
package/android/.classpath +1 -1
package/android/.settings/org.eclipse.buildship.core.prefs +1 -1
package/android/build.gradle +5 -5
package/android/src/main/java/com/reactlibrary/RNMappPluginModule.java +30 -55
package/package.json +1 -1

package/.idea/workspace.xml CHANGED Viewed

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="8b4f258a-c093-494f-afe5-5f5a25c90893" name="Default Changelist" comment="" />
+    <list default="true" id="8b4f258a-c093-494f-afe5-5f5a25c90893" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -77,7 +80,7 @@
       <workItem from="1633566225798" duration="599000" />
       <workItem from="1634673153825" duration="3131000" />
       <workItem from="1635406438746" duration="1187000" />
-      <workItem from="1635764727836" duration="7302000" />
+      <workItem from="1635764727836" duration="10080000" />
     </task>
     <task id="LOCAL-00001" summary="new version">
       <created>1632917445507</created>

package/android/.classpath CHANGED Viewed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

package/android/.settings/org.eclipse.buildship.core.prefs CHANGED Viewed

@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.0-rc-1))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=C\:/Program Files/Java/jdk-16.0.2
+java.home=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle CHANGED Viewed

@@ -35,12 +35,12 @@ def safeExtGet(prop, fallback) {
 }
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 29)
-    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.2')
+    compileSdkVersion safeExtGet('compileSdkVersion', 31)
+    buildToolsVersion safeExtGet('buildToolsVersion', '30.0.3')
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 19)
-        targetSdkVersion safeExtGet('targetSdkVersion', 29)
+        targetSdkVersion safeExtGet('targetSdkVersion', 31)
         versionCode 1
         versionName '1.0'
     }
@@ -54,7 +54,6 @@ android {
 }
 dependencies {
     implementation('com.facebook.react:react-native:+')
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.google.code.gson:gson:2.8.5'
@@ -71,5 +70,6 @@ dependencies {
                 }
     implementation 'androidx.media:media:1.0.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'com.mapp.sdk:mapp-android:6.0.17-special12'
+    implementation 'com.mapp.sdk:mapp-android:6.0.17-special13'
 }

package/android/src/main/java/com/reactlibrary/RNMappPluginModule.java CHANGED Viewed

@@ -8,6 +8,7 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.ContextCompat;
@@ -22,6 +23,7 @@ import com.appoxee.internal.inapp.model.MessageContext;
 import com.appoxee.internal.inapp.model.Tracking;
 import com.appoxee.internal.inapp.model.TrackingAttributes;
 import com.appoxee.internal.service.AppoxeeServiceAdapter;
+import com.appoxee.internal.util.ResultCallback;
 import com.appoxee.push.NotificationMode;
 import com.appoxee.push.PushData;
 import com.facebook.react.bridge.Arguments;
@@ -285,63 +287,38 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
     @ReactMethod
-    public void startGeoFencing() {
+    public void startGeofencing(final Promise promise) {
+        Appoxee.instance().startGeoFencing(new ResultCallback<String>() {
+            @Override
+            public void onResult(@Nullable String result) {
+                promise.resolve(result);
+            }
+        });
+    }
-        Appoxee.instance().startGeoFencing();
-//         if (Build.VERSION.SDK_INT < 23) {
-//             Appoxee.instance().startGeoFencing();
-//         } else if (Build.VERSION.SDK_INT <= 28) {
-//             RequestPermissionsTask task = new RequestPermissionsTask(getReactApplicationContext(),
-//                     new RequestPermissionsTask.Callback() {
-//                         @Override
-//                         public void onResult(boolean enabled) {
-//                             if (enabled) {
-//
-//                                 Appoxee.instance().startGeoFencing();
-//                             }
-//                         }
-//                     });
-//             task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION);
-//
-//         } else if (Build.VERSION.SDK_INT == 29) {
-//             RequestPermissionsTask task = new RequestPermissionsTask(getReactApplicationContext(),
-//                     new RequestPermissionsTask.Callback() {
-//                         @Override
-//                         public void onResult(boolean enabled) {
-//                             if (enabled) {
-//
-//                                 Appoxee.instance().startGeoFencing();
-//                             }
-//                         }
-//                     });
-//             task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION);
-//
-//         } else if (Build.VERSION.SDK_INT == 30) {
-//             RequestPermissionsTask task = new RequestPermissionsTask(getReactApplicationContext(),
-//                     new RequestPermissionsTask.Callback() {
-//                         @Override
-//                         public void onResult(boolean enabled) {
-//                             if (enabled) {
-//                                 Appoxee.instance().startGeoFencing();
-//                                 RequestPermissionsTask task2 = new RequestPermissionsTask(getReactApplicationContext(),
-//                                         new RequestPermissionsTask.Callback() {
-//                                             @Override
-//                                             public void onResult(boolean enabled) {
-//                                                 if (enabled) {
-//                                                     Appoxee.instance().startGeoFencing();
-//                                                 }
-//                                             }
-//                                         });
-//                                 task2.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Manifest.permission.ACCESS_BACKGROUND_LOCATION);
-//
-//                             }
-//                         }
-//                     });
-//             task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION);
-//         }
+    @ReactMethod
+    public void stopGeofencing(final Promise promise) {
+        Appoxee.instance().stopGeoFencing(new ResultCallback<String>() {
+            @Override
+            public void onResult(@Nullable String result) {
+                promise.resolve(result);
+            }
+        });
+    }
+    /**
+     * This method is deprecated in Java. Use method {@link #startGeofencing(ResultCallback)}}
+     */
+    @ReactMethod
+    @Deprecated()
+    public void startGeoFencing() {
+        Appoxee.instance().startGeoFencing();
     }
+    /**
+     * Deprecated in Java. Use method {@link #stopGeofencing(ResultCallback)}
+     */
+    @Deprecated
     @ReactMethod
     public void stopGeoFencing() {
         Appoxee.instance().stopGeoFencing();
@@ -369,8 +346,6 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
                 promise.resolve(messageToJson(message));
             }
         });
     }
     @ReactMethod

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.0.11-beta3",
+  "version": "1.0.11-beta4",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "scripts": {