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

package/.idea/workspace.xml

@@ -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" />
@@ -76,7 +79,8 @@
       <workItem from="1632991423561" duration="15597000" />
       <workItem from="1633566225798" duration="599000" />
       <workItem from="1634673153825" duration="3131000" />
-      <workItem from="1635406438746" duration="1149000" />
+      <workItem from="1635406438746" duration="1187000" />
+      <workItem from="1635764727836" duration="10080000" />
     </task>
     <task id="LOCAL-00001" summary="new version">
       <created>1632917445507</created>
@@ -113,7 +117,14 @@
       <option name="project" value="LOCAL" />
       <updated>1635407568834</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="Fixed android issue when engage late">
+      <created>1635776654720</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1635776654720</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -141,6 +152,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="new version" />
     <MESSAGE value="Update script to run on all linux systems" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update script to run on all linux systems" />
+    <MESSAGE value="Fixed android issue when engage late" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed android issue when engage late" />
   </component>
 </project>

package/android/.classpath

@@ -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

@@ -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

@@ -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,12 +54,7 @@ android {
 }
 
 dependencies {
-
     implementation('com.facebook.react:react-native:+')
-    implementation('com.google.android.gms:play-services-location:16.0.0')
-            {
-                exclude group: 'com.android.support'
-            }
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.dagger:dagger:2.24'
@@ -69,8 +64,12 @@ dependencies {
             {
                 exclude group: 'com.android.support'
             }
-    api('com.google.android.gms:play-services-location:16.0.0')
+    api('com.google.android.gms:play-services-location:18.0.0')
+      {
+                    exclude group: 'com.android.support'
+                }
     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-special8'
-}
+    implementation 'com.mapp.sdk:mapp-android:6.0.17-special13'
+}
+

package/android/src/main/java/com/reactlibrary/MessageService.java

@@ -1,11 +1,15 @@
 package com.reactlibrary;
 
 import com.appoxee.Appoxee;
+import com.appoxee.internal.logger.LoggerFactory;
+import com.appoxee.internal.service.AppoxeeServiceAdapter;
 import com.appoxee.push.fcm.MappMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import java.util.concurrent.TimeUnit;
 
-public  class MessageService extends MappMessagingService {
+
+public class MessageService extends MappMessagingService {
 
     @Override
     public void onCreate() {
@@ -15,11 +19,29 @@ public  class MessageService extends MappMessagingService {
 
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
-        super.onMessageReceived(remoteMessage);
+        int limit = 15;
+        try {
+            while (limit >= 0 &&  (AppoxeeServiceAdapter.getInstance() == null || !AppoxeeServiceAdapter.getInstance().isQueryReady())) {
+                TimeUnit.MILLISECONDS.sleep(300);
+                limit--;
+            }
+            super.onMessageReceived(remoteMessage);
+        } catch (Exception e) {
+            LoggerFactory.getDevLogger().e(e.getMessage());
+        }
     }
 
     @Override
     public void onNewToken(String s) {
-        super.onNewToken(s);
+        int limit = 15;
+        try {
+            while (limit >= 0 &&  (AppoxeeServiceAdapter.getInstance() == null || !AppoxeeServiceAdapter.getInstance().isQueryReady())) {
+                TimeUnit.MILLISECONDS.sleep(300);
+                limit--;
+            }
+            super.onNewToken(s);
+        } catch (Exception e) {
+            LoggerFactory.getDevLogger().e(e.getMessage());
+        }
     }
 }

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

@@ -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;
@@ -107,12 +109,12 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setRemoteMessage(String msgJson) {
-        RemoteMessage remoteMessage = getRemoteMessage(msgJson);
-        if (remoteMessage != null){
-            Appoxee.instance().setRemoteMessage(remoteMessage);
-        }
-    }
+      public void setRemoteMessage(String msgJson) {
+          RemoteMessage remoteMessage = getRemoteMessage(msgJson);
+          if (remoteMessage != null && Appoxee.instance() != null) {
+              Appoxee.instance().setRemoteMessage(remoteMessage);
+          }
+      }
 
     @ReactMethod
     public void isPushFromMapp(String msgJson, Promise promise) {
@@ -127,6 +129,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setToken(String token) {
+    if (Appoxee.instance() != null)
         Appoxee.instance().setToken(token);
     }
 
@@ -284,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();
@@ -368,8 +346,6 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
                 promise.resolve(messageToJson(message));
             }
         });
-
-
     }
 
     @ReactMethod
@@ -598,4 +574,4 @@ private RemoteMessage getRemoteMessage(String jsonMsg) {
     }
 
 
-}
+}

package/package.json

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