react-native-mapp-plugin 1.1.1 → 1.1.3

package/RNMappPlugin.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.library = 'sqlite3'
   s.dependency "React" 
   s.dependency "MappSDK" , '~> 6.0.6'
-  s.dependency "MappSDKInapp", '6.0.6.9'
+  s.dependency "MappSDKInapp"
   s.dependency "MappSDKGeotargeting"
 
 end

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-11/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

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

@@ -1,11 +1,11 @@
 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.4.2))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
+java.home=/Users/semsudin.tafilovic/Library/Java/JavaVirtualMachines/jbr-17.0.9/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -9,10 +9,9 @@ buildscript {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:7.3.1')
+        classpath('com.android.tools.build:gradle:8.2.2')
         //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
@@ -23,8 +22,8 @@ buildscript {
 allprojects {
     repositories {
         google()
+        mavenLocal()
         mavenCentral()
-        jcenter()
         maven { url "https://maven.google.com/" }
     }
 }
@@ -35,12 +34,13 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 33)
-    buildToolsVersion safeExtGet('buildToolsVersion', '33.0.1')
+    namespace 'com.reactlibrary'
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+    buildToolsVersion safeExtGet('buildToolsVersion', '34.0.0')
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 33)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName '1.0'
     }
@@ -54,18 +54,18 @@ android {
 }
 
 dependencies {
-    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.6.0'
-    implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+    implementation('com.facebook.react:react-native:0.20.1')
+    implementation 'com.google.code.gson:gson:2.10.1'
+    //implementation 'com.google.dagger:dagger:2.24'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
-    implementation platform('com.google.firebase:firebase-bom:29.0.4')
+    implementation platform('com.google.firebase:firebase-bom:32.7.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'
+    api('com.google.android.gms:play-services-location:21.2.0')
+    implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation("com.mapp.sdk:mapp-android:6.0.20.2")
+    implementation("com.mapp.sdk:mapp-android:6.0.23")
 }
 

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-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 android.enableAapt2=false

package/android/src/main/AndroidManifest.xml

@@ -42,7 +42,6 @@
                     <category android:name="${applicationId}" />
 
             </intent-filter>
-
         </activity>
         <service
             android:name="com.appoxee.push.fcm.MappMessagingService"

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

@@ -25,6 +25,7 @@ public class ActivityListener extends Activity {
         launchIntent.putExtra("action", intent.getAction());
         launchIntent.setData(intent.getData());
         launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        launchIntent.setPackage(this.getPackageName());
         startActivity(launchIntent);
         Appoxee.handleRichPush(this,intent);
         finish();

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

@@ -27,24 +27,16 @@ public class HelperActivity extends Activity {
             return;
         }
 
-        ComponentName name = intent.getComponent();
-        String packageName = getPackageName();
-
-        if (Objects.equals(name.getPackageName(), packageName)) {
-            if (intent.getAction() != null && !intent.getAction().equals("")) {
-                Intent launchIntent = getDefaultActivityIntent();
-                ComponentName launcherComponent = launchIntent.getComponent();
+        if (intent.getAction() != null && !intent.getAction().equals("")) {
+            Intent launchIntent = getDefaultActivityIntent();
+            launchIntent.setPackage(this.getPackageName());
+            launchIntent.putExtra("action", intent.getAction());
+            launchIntent.setData(intent.getData());
+            launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+            startActivity(launchIntent);
 
-                if (Objects.equals(launcherComponent.getPackageName(), packageName)) {
-                    launchIntent.putExtra("action", intent.getAction());
-                    launchIntent.setData(intent.getData());
-                    launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-                    startActivity(launchIntent);
-                }
-
-                EventEmitter.shared().sendEvent(new IntentNotificationEvent(Objects.requireNonNull(intent.getData()), intent.getAction()));
-                finish();
-            }
+            EventEmitter.shared().sendEvent(new IntentNotificationEvent(Objects.requireNonNull(intent.getData()), intent.getAction()));
+            finish();
         }
     }
 

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

@@ -12,6 +12,7 @@ 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);
     }

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

@@ -2,18 +2,14 @@
 package com.reactlibrary;
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.Application;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.util.Log;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.ContextCompat;
-import androidx.fragment.app.FragmentActivity;
 
 import com.appoxee.Appoxee;
 import com.appoxee.AppoxeeOptions;
@@ -25,6 +21,7 @@ import com.appoxee.internal.inapp.model.InAppStatistics;
 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.permission.PermissionHelper;
 import com.appoxee.internal.permission.PermissionsCallback;
 import com.appoxee.internal.permission.PermissionsManager;
 import com.appoxee.internal.service.AppoxeeServiceAdapter;
@@ -41,14 +38,12 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.google.firebase.messaging.RemoteMessage;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -116,77 +111,47 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void requestGeofenceLocationPermission(Promise promise) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M && getCurrentActivity() instanceof ReactActivity) {
-            ReactActivity activity = (ReactActivity) getCurrentActivity();
-            boolean fineLoc = activity
-                    .checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-            boolean backLoc = activity.checkSelfPermission(
-                    Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
-            boolean coarseLoc = activity.checkSelfPermission(
-                    Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-            boolean geofencePermission = false;
-            List<String> requiredPermissions = new ArrayList<>();
-            requiredPermissions.addAll(
-                    List.of(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION));
-
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                geofencePermission = fineLoc;
-            } else {
-                geofencePermission = fineLoc && backLoc;
-            }
-
-            if (!geofencePermission) {
-                activity.requestPermissions(requiredPermissions.toArray(new String[] {}), 1,
-                        (requestCode, permissions, results) -> {
-                            for (int i : results) {
-                                if (i != PackageManager.PERMISSION_GRANTED) {
-                                    // Toast.makeText(activity, "PERMISSION NOT GRANTED",
-                                    // Toast.LENGTH_SHORT).show();
-                                    promise.resolve(false);
-                                    return false;
-                                }
-                            }
-                            // Toast.makeText(activity, "PERMISSION GRANTED", Toast.LENGTH_SHORT).show();
-                            promise.resolve(true);
-                            return true;
-                        });
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            promise.resolve(true);
+        } else {
+            if (getCurrentActivity() instanceof ReactActivity) {
+                int fineLocation = getCurrentActivity().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION);
+                int backgroundLocation = getCurrentActivity().checkSelfPermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION);
+
+                if (fineLocation != PermissionsManager.PERMISSION_GRANTED ||
+                        backgroundLocation != PermissionsManager.PERMISSION_GRANTED) {
+                    PermissionHelper.getInstance().openAppSystemSettings(getCurrentActivity());
+                    promise.resolve(false);
+                } else {
+                    promise.resolve(true);
+                }
             } else {
-                // Toast.makeText(activity, "PERMISSION ALREADY GRANTED",
-                // Toast.LENGTH_SHORT).show();
-                promise.resolve(true);
+                promise.reject("Can't access activity for requesting permission!");
             }
-        } else {
-            promise.reject("Can't access activity for requesting permission!");
         }
     }
 
     @ReactMethod
     public void requestPostNotificationPermission(Promise promise) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2 && getCurrentActivity() instanceof ReactActivity) {
-            ReactActivity activity = (ReactActivity) getCurrentActivity();
-            if (activity
-                    .checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-                activity.requestPermissions(new String[] { Manifest.permission.POST_NOTIFICATIONS }, 1,
-                        (requestCode, permissions, results) -> {
-                            for (int i : results) {
-                                if (i != PackageManager.PERMISSION_GRANTED) {
-                                    // Toast.makeText(activity, "PERMISSION NOT GRANTED",
-                                    // Toast.LENGTH_SHORT).show();
-                                    promise.resolve(false);
-                                    return false;
-                                }
-                            }
-                            // Toast.makeText(activity, "PERMISSION GRANTED", Toast.LENGTH_SHORT).show();
-                            promise.resolve(true);
-                            return true;
-                        });
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            promise.resolve(true);
+        } else {
+            if (getCurrentActivity() instanceof ReactActivity) {
+                ReactActivity activity = (ReactActivity) getCurrentActivity();
+                Appoxee.instance().requestNotificationsPermission(activity, new PermissionsCallback() {
+                    @Override
+                    public void onPermissionsResult(Map<String, Integer> map) {
+                        if (map.containsKey(Manifest.permission.POST_NOTIFICATIONS)) {
+                            Integer result = map.get(Manifest.permission.POST_NOTIFICATIONS);
+                            promise.resolve(result == PermissionsManager.PERMISSION_GRANTED);
+                        } else {
+                            promise.resolve(false);
+                        }
+                    }
+                });
             } else {
-                // Toast.makeText(activity, "PERMISSION ALREADY GRANTED",
-                // Toast.LENGTH_SHORT).show();
-                promise.resolve(true);
+                promise.reject("Can't access activity for requesting permission!");
             }
-        } else {
-            promise.reject("Can't access activity for requesting permission!");
         }
     }
 
@@ -267,7 +232,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void engageTestServer(String cepURl, String sdkKey, String googleProjectId, String server, String appID,
-            String tenantID) {
+                                 String tenantID) {
         AppoxeeOptions opt = new AppoxeeOptions();
         opt.appID = appID;
         opt.sdkKey = sdkKey;
@@ -418,7 +383,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void fetchLatestInboxMessage(final Promise promise) {
 
-        Appoxee.instance().fetchInboxMessages(reactContext.getApplicationContext());
+        Appoxee.instance().fetchInboxMessages();
 
         InAppInboxCallback inAppInboxCallback = new InAppInboxCallback();
         inAppInboxCallback.addInAppInboxMessagesReceivedCallback(new InAppInboxCallback.onInAppInboxMessagesReceived() {
@@ -447,7 +412,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void fetchInboxMessage(final Promise promise) {
 
-        Appoxee.instance().fetchInboxMessages(reactContext.getApplicationContext());
+        Appoxee.instance().fetchInboxMessages();
 
         InAppInboxCallback inAppInboxCallback = new InAppInboxCallback();
         inAppInboxCallback.addInAppInboxMessagesReceivedCallback(new InAppInboxCallback.onInAppInboxMessagesReceived() {
@@ -498,8 +463,8 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void triggerStatistic(Integer templateId, String originalEventId,
-            String trackingKey, Long displayMillis,
-            String reason, String link) {
+                                 String trackingKey, Long displayMillis,
+                                 String reason, String link) {
         Appoxee.instance()
                 .triggerStatistcs((reactContext.getApplicationContext()), getInAppStatisticsRequestObject(templateId,
                         originalEventId, trackingKey, displayMillis, reason, link));
@@ -546,8 +511,8 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     private static InAppStatistics getInAppStatisticsRequestObject(int templateId, String originalEventId,
-            String trackingKey, Long displayMillis,
-            String reason, String link) {
+                                                                   String trackingKey, Long displayMillis,
+                                                                   String reason, String link) {
 
         InAppStatistics inAppStatistics = new InAppStatistics();
         // This will be received from the respective Screens.
@@ -675,7 +640,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
                     .setCollapseKey(collapseKey);
 
             if (data != null) {
-                for (Iterator<String> it = data.keys(); it.hasNext();) {
+                for (Iterator<String> it = data.keys(); it.hasNext(); ) {
                     String k = it.next();
                     builder.addData(k, data.getString(k));
                 }

package/ios/RNMappEventEmmiter.m

@@ -65,7 +65,7 @@ NSString *const MappRNInappMessage = @"com.mapp.inapp_message";
 
 -(APXInBoxMessage *) getMessageWith: (NSNumber *) templateId event: (NSString *) eventId {
     for(APXInBoxMessage *message in self.messages) {
-        if ([message.messageId isEqualToString:templateId.stringValue] && [message.getMessageIdentifier isEqualToString:eventId]) {
+        if ([message.messageId isEqualToString:templateId.stringValue]) {
             return message;
         }
     }

package/ios/RNMappPluginModule.m

@@ -66,6 +66,10 @@ RCT_EXPORT_METHOD(setAlias:(NSString *) alias) {
     }];
 }
 
+RCT_EXPORT_METHOD(setToken:(NSString *) token) {
+    [[Appoxee shared] didRegisterForRemoteNotificationsWithDeviceToken:[[NSData alloc] initWithBase64EncodedString:token options:NSUTF8StringEncoding]];
+}
+
 RCT_EXPORT_METHOD(removeDeviceAlias) {
     [[Appoxee shared] removeDeviceAliasWithCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
             if (appoxeeError != nil) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "keywords": [

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Oct 31 15:25:54 CET 2023
-gradle.version=7.4.2