react-native-mapp-plugin 1.0.10-special1 → 1.0.11-beta10

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

@@ -1,54 +1,52 @@
-package com.reactlibrary;
-
-import android.net.Uri;
-
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-
-/**
- * Created by Aleksandar Marinkovic on 2019-05-16.
- * Copyright (c) 2019 MAPP.
- */
-public class IntentNotificationEvent implements Event {
-
-    private static final String PUSH_RECEIVED_EVENT = "com.mapp.deep_link_received";
-
-    @Override
-    public String getName() {
-        return PUSH_RECEIVED_EVENT;
-    }
-
-    @Override
-    public WritableMap getBody() {
-
-        WritableMap writableMap = new WritableNativeMap();
-        if (message != null) {
-            try {
-                String link = message.getQueryParameter("link");
-                String messageId = message.getQueryParameter("message_id");
-                String event_trigger = message.getQueryParameter("event_trigger");
-                writableMap.putString("action", messageId);
-                writableMap.putString("url", link);
-                writableMap.putString("event_trigger", event_trigger);
-            } catch (Exception e) {
-                writableMap.putString("url", message.toString());
-            }
-        } else {
-            writableMap.putString("url", "");
-            writableMap.putString("action", type);
-        }
-
-        return writableMap;
-    }
-
-    private final Uri message;
-    private final String type;
-
-    public IntentNotificationEvent(Uri message, String type) {
-        this.message = message;
-        this.type = type;
-    }
-
-
-}
+package com.reactlibrary;
+
+import android.net.Uri;
+
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+
+/**
+ * Created by Aleksandar Marinkovic on 2019-05-16.
+ * Copyright (c) 2019 MAPP.
+ */
+public class IntentNotificationEvent implements Event {
+
+    private static final String PUSH_RECEIVED_EVENT = "com.mapp.deep_link_received";
+
+    @Override
+    public String getName() {
+        return PUSH_RECEIVED_EVENT;
+    }
+
+    @Override
+    public WritableMap getBody() {
+
+        WritableMap writableMap = new WritableNativeMap();
+        if (message != null) {
+            try {
+                String link = message.getQueryParameter("link");
+                String messageId = message.getQueryParameter("message_id");
+                String event_trigger = message.getQueryParameter("event_trigger");
+                writableMap.putString("action", messageId);
+                writableMap.putString("url", link);
+                writableMap.putString("event_trigger", event_trigger);
+            } catch (Exception e) {
+                writableMap.putString("url", message.toString());
+            }
+        } else {
+            writableMap.putString("url", "");
+            writableMap.putString("action", type);
+        }
+
+        return writableMap;
+    }
+
+    private final Uri message;
+    private final String type;
+
+    public IntentNotificationEvent(Uri message, String type) {
+        this.message = message;
+        this.type = type;
+    }
+}

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

@@ -1,36 +1,45 @@
-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 {
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        Appoxee.engage(getApplication());
-    }
-
-    @Override
-    public void onMessageReceived(RemoteMessage remoteMessage) {
-        super.onMessageReceived(remoteMessage);
-    }
-
-    @Override
-    public void onNewToken(String s) {
-        try {
-            while (AppoxeeServiceAdapter.getInstance() == null || !AppoxeeServiceAdapter.getInstance().isQueryReady()) {
-                TimeUnit.MILLISECONDS.sleep(100);
-            }
-            super.onNewToken(s);
-        } catch (Exception e) {
-            LoggerFactory.getDevLogger().e(e.getMessage());
-        }
-    }
-}
+package com.reactlibrary;
+
+import androidx.annotation.NonNull;
+
+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 {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Appoxee.engage(getApplication());
+    }
+
+    @Override
+    public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
+        waitInitialization();
+        super.onMessageReceived(remoteMessage);
+    }
+
+    @Override
+    public void onNewToken(String s) {
+        waitInitialization();
+        super.onNewToken(s);
+    }
+
+    private void waitInitialization(){
+        int limit=15;
+        try{
+            while (limit >= 0 && !Appoxee.instance().isReady()) {
+                TimeUnit.MILLISECONDS.sleep(300);
+                limit--;
+            }
+        }catch (Exception e){
+            LoggerFactory.getDevLogger().e(e.getMessage());
+        }
+    }
+}

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

@@ -1,43 +1,43 @@
-package com.reactlibrary;
-
-import android.util.Log;
-
-import com.appoxee.push.PushData;
-import com.appoxee.push.PushDataReceiver;
-/**
- * Created by Aleksandar Marinkovic on 2019-05-15.
- * Copyright (c) 2019 MAPP.
- */
-public  class MyPushBroadcastReceiver extends PushDataReceiver {
-    @Override
-    public void onPushReceived(PushData pushData) {
-        Log.d("APX", "Push received " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushReceived"));
-        super.onPushReceived(pushData);
-    }
-
-    @Override
-    public void onPushOpened(PushData pushData) {
-        Log.d("APX", "Push opened " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushOpened"));
-       super.onPushOpened(pushData);
-    }
-
-    @Override
-    public void onPushDismissed(PushData pushData) {
-        Log.d("APX", "Push dismissed " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushDismissed"));
-        super.onPushDismissed(pushData);
-    }
-
-
-    @Override
-    public void onSilentPush(PushData pushData) {
-        Log.d("APX", "Push Silent " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onSilentPush"));
-        super.onSilentPush(pushData);
-
-    }
-
-
-}
+package com.reactlibrary;
+
+import android.util.Log;
+
+import com.appoxee.push.PushData;
+import com.appoxee.push.PushDataReceiver;
+/**
+ * Created by Aleksandar Marinkovic on 2019-05-15.
+ * Copyright (c) 2019 MAPP.
+ */
+public  class MyPushBroadcastReceiver extends PushDataReceiver {
+    @Override
+    public void onPushReceived(PushData pushData) {
+        Log.d("APX", "Push received " + pushData);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushReceived"));
+        super.onPushReceived(pushData);
+    }
+
+    @Override
+    public void onPushOpened(PushData pushData) {
+        Log.d("APX", "Push opened " + pushData);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushOpened"));
+       super.onPushOpened(pushData);
+    }
+
+    @Override
+    public void onPushDismissed(PushData pushData) {
+        Log.d("APX", "Push dismissed " + pushData);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushDismissed"));
+        super.onPushDismissed(pushData);
+    }
+
+
+    @Override
+    public void onSilentPush(PushData pushData) {
+        Log.d("APX", "Push Silent " + pushData);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onSilentPush"));
+        super.onSilentPush(pushData);
+
+    }
+
+
+}

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

@@ -1,37 +1,37 @@
-package com.reactlibrary;
-
-import androidx.annotation.NonNull;
-
-import com.appoxee.push.PushData;
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * Created by Aleksandar Marinkovic on 2019-05-16.
- * Copyright (c) 2019 MAPP.
- */
-public class PushNotificationEvent implements Event {
-
-    private static final String PUSH_RECEIVED_EVENT = "com.mapp.rich_message_received";
-
-    @NonNull
-    @Override
-    public String getName() {
-        return PUSH_RECEIVED_EVENT;
-    }
-
-    @NonNull
-    @Override
-    public WritableMap getBody() {
-        return RNUtils.getPushMessageToJSon(message, type);
-    }
-
-    private final PushData message;
-    private final String type;
-
-    public PushNotificationEvent(@NonNull PushData message, String type) {
-        this.message = message;
-        this.type = type;
-    }
-
-
-}
+package com.reactlibrary;
+
+import androidx.annotation.NonNull;
+
+import com.appoxee.push.PushData;
+import com.facebook.react.bridge.WritableMap;
+
+/**
+ * Created by Aleksandar Marinkovic on 2019-05-16.
+ * Copyright (c) 2019 MAPP.
+ */
+public class PushNotificationEvent implements Event {
+
+    private static final String PUSH_RECEIVED_EVENT = "com.mapp.rich_message_received";
+
+    @NonNull
+    @Override
+    public String getName() {
+        return PUSH_RECEIVED_EVENT;
+    }
+
+    @NonNull
+    @Override
+    public WritableMap getBody() {
+        return RNUtils.getPushMessageToJSon(message, type);
+    }
+
+    private final PushData message;
+    private final String type;
+
+    public PushNotificationEvent(@NonNull PushData message, String type) {
+        this.message = message;
+        this.type = type;
+    }
+
+
+}