react-native-mapp-plugin 1.0.11-beta8 → 1.1.0-beta01

package/android/.idea/modules.xml

@@ -3,7 +3,10 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/android.androidTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/android.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.main.iml" filepath="$PROJECT_DIR$/.idea/modules/android.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/android.unitTest.iml" />
     </modules>
   </component>
 </project>

package/android/.project

@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1631252221329</id>
+			<id>0</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

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

@@ -1,11 +1,11 @@
-arguments=
-auto.sync=false
+arguments=--init-script /var/folders/t6/pvjmf_n16v706r03q_t_vlx58tvf6j/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/t6/pvjmf_n16v706r03q_t_vlx58tvf6j/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=true
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.1.1))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -12,8 +12,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
-
+        classpath('com.android.tools.build:gradle:7.3.1')
+        //classpath('com.google.gms:google-services:4.3.15')
+        //classpath("com.facebook.react:react-native-gradle-plugin")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -24,23 +25,22 @@ allprojects {
         google()
         mavenCentral()
         jcenter()
-        maven { url "https://maven.google.com/"}
+        maven { url "https://maven.google.com/" }
     }
 }
 apply plugin: 'com.android.library'
 
-
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 31)
-    buildToolsVersion safeExtGet('buildToolsVersion', '30.0.3')
+    compileSdkVersion safeExtGet('compileSdkVersion', 33)
+    buildToolsVersion safeExtGet('buildToolsVersion', '33.0.1')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 19)
-        targetSdkVersion safeExtGet('targetSdkVersion', 31)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
+        targetSdkVersion safeExtGet('targetSdkVersion', 33)
         versionCode 1
         versionName '1.0'
     }
@@ -54,22 +54,18 @@ android {
 }
 
 dependencies {
-    implementation('com.facebook.react:react-native:+')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation("com.facebook.react:react-native:+")
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.dagger:dagger:2.24'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
-    implementation("com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '20.0.0')}")
-            {
-                exclude group: 'com.android.support'
-            }
-    api('com.google.android.gms:play-services-location:18.0.0')
-      {
-                    exclude group: 'com.android.support'
-                }
-    implementation 'androidx.media:media:1.0.1'
+    implementation platform('com.google.firebase:firebase-bom:29.0.4')
+    implementation('com.google.firebase:firebase-messaging')
+    api('com.google.android.gms:play-services-location:21.0.1')
+    implementation 'androidx.media:media:1.6.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'com.mapp.sdk:mapp-android:6.0.17-special17'
+    implementation 'com.mapp.sdk:mapp-android:6.0.19'
 }
 

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 android.enableAapt2=false

package/android/gradle.properties

@@ -13,3 +13,4 @@
 #Sun Sep 12 15:56:18 CEST 2021
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

package/android/src/main/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactlibrary">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.reactlibrary">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application>
         <receiver
@@ -42,6 +44,14 @@
             </intent-filter>
 
         </activity>
+        <service
+            android:name="com.appoxee.push.fcm.MappMessagingService"
+            tools:node="remove"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
         <service android:name=".MessageService"
             android:exported="false">
             <intent-filter>
@@ -52,8 +62,7 @@
                 android:name=".ActivityListener"
                 android:exported="false"
                 android:theme="@style/HelperActivityStyle">
-            <intent-filter
-            >
+            <intent-filter>
                 <action android:name="com.mapp.RICH_PUSH" />
                 <category android:name="${applicationId}" />
 

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

@@ -26,7 +26,7 @@ public class ActivityListener extends Activity {
         launchIntent.setData(intent.getData());
         launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         startActivity(launchIntent);
-        Appoxee.handleRichPush(Appoxee.instance().getLastActivity(),intent);
+        Appoxee.handleRichPush(this,intent);
         finish();
     }
 

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

@@ -2,23 +2,18 @@
 
 package com.reactlibrary;
 
-
 import android.os.Handler;
 import android.os.Looper;
 
-
 import androidx.annotation.MainThread;
 
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
-
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.SynchronousQueue;
 
 /**
  * Created by Aleksandar Marinkovic on 2019-05-15.
@@ -26,13 +21,12 @@ import java.util.Set;
  */
 class EventEmitter {
 
-    private static EventEmitter sharedInstance = new EventEmitter();
+    private static final EventEmitter sharedInstance = new EventEmitter();
 
-    private final List<Event> pendingEvents = new ArrayList<>();
-    private final Set<String> knownListeners = new HashSet<>();
+    private final Queue<Event> pendingEvents = new ConcurrentLinkedQueue<>();
+    private final Queue<String> knownListeners = new ConcurrentLinkedQueue<>();
     private final Handler mainHandler = new Handler(Looper.getMainLooper());
 
-    private long listenerCount;
     private ReactContext reactContext;
 
     /**
@@ -65,16 +59,11 @@ class EventEmitter {
      * @param event The event.
      */
     void sendEvent(final Event event) {
-        mainHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                synchronized (knownListeners) {
-                    if (!knownListeners.contains(event.getName()) || !emit(event)) {
-                        pendingEvents.add(event);
-                    }
-                }
+        synchronized (knownListeners) {
+            if (!knownListeners.contains(event.getName()) || !emit(event)) {
+                pendingEvents.add(event);
             }
-        });
+        }
     }
 
     /**
@@ -84,7 +73,6 @@ class EventEmitter {
      */
     void addAndroidListener(String eventName) {
         synchronized (knownListeners) {
-            listenerCount++;
             knownListeners.add(eventName);
         }
 
@@ -103,10 +91,11 @@ class EventEmitter {
      */
     void removeAndroidListeners(int count) {
         synchronized (knownListeners) {
-            listenerCount -= count;
-            if (listenerCount <= 0) {
-                listenerCount = 0;
-                knownListeners.clear();
+            for (int i = 0; i < count; i++) {
+                if (knownListeners.size() > 0)
+                    knownListeners.remove();
+                else
+                    break;
             }
         }
     }

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

@@ -1,10 +1,11 @@
 package com.reactlibrary;
 
+import android.util.Log;
+
 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;
 
@@ -21,6 +22,7 @@ public class MessageService extends MappMessagingService {
 
     @Override
     public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
+        Log.d("onMessageReceived", remoteMessage.toString());
         waitInitialization();
         super.onMessageReceived(remoteMessage);
     }