react-native-mapp-plugin 1.0.11-beta6 → 1.0.11-beta7

package/android/build.gradle

@@ -70,6 +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-special14'
+    implementation 'com.mapp.sdk:mapp-android:6.0.17-special15'
 }
 

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

@@ -1,5 +1,7 @@
 package com.reactlibrary;
 
+import androidx.annotation.NonNull;
+
 import com.appoxee.Appoxee;
 import com.appoxee.internal.logger.LoggerFactory;
 import com.appoxee.internal.service.AppoxeeServiceAdapter;
@@ -18,29 +20,25 @@ public class MessageService extends MappMessagingService {
     }
 
     @Override
-    public void onMessageReceived(RemoteMessage 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());
-        }
+    public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
+        waitInitialization();
+        super.onMessageReceived(remoteMessage);
     }
 
     @Override
     public void onNewToken(String s) {
-        int limit = 15;
-        try {
-            while (limit >= 0 &&  (AppoxeeServiceAdapter.getInstance() == null || !AppoxeeServiceAdapter.getInstance().isQueryReady())) {
+        waitInitialization();
+        super.onNewToken(s);
+    }
+
+    private void waitInitialization(){
+        int limit=15;
+        try{
+            while (limit >= 0 && !Appoxee.instance().isReady()) {
                 TimeUnit.MILLISECONDS.sleep(300);
                 limit--;
             }
-            super.onNewToken(s);
-        } catch (Exception e) {
+        }catch (Exception e){
             LoggerFactory.getDevLogger().e(e.getMessage());
         }
     }

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

@@ -111,7 +111,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     @ReactMethod
       public void setRemoteMessage(String msgJson) {
           RemoteMessage remoteMessage = getRemoteMessage(msgJson);
-          if (remoteMessage != null && AppoxeeServiceAdapter.getInstance() != null) {
+          if (remoteMessage != null) {
               Appoxee.instance().setRemoteMessage(remoteMessage);
           }
       }
@@ -129,7 +129,6 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setToken(String token) {
-    if (AppoxeeServiceAdapter.getInstance() != null)
         Appoxee.instance().setToken(token);
     }
 

package/package.json

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