react-native-mapp-plugin 1.0.11-beta1 → 1.0.11-beta12

package/Mapp.js

@@ -117,8 +117,8 @@ export class Mapp {
     tenantID: string
   ) {
     if (Platform.OS == "ios") {
-      RNMappPluginModule.engageInapp(server);
-      return RNMappPluginModule.autoengage(server);
+      RNMappPluginModule.autoengage(server);
+      return RNMappPluginModule.engageInapp(server);
     }
     return RNMappPluginModule.engage(
       sdkKey,
@@ -182,8 +182,21 @@ export class Mapp {
    * iOS only
    */
   static showNotificationAlertView() {
-    return RNMappPluginModule.showNotificationAlertView();
-  }  
+    if (Platform.OS === "ios") {
+      return RNMappPluginModule.showNotificationAlertView();
+    }
+
+  }
+
+  /**
+   * Display notifications even app is in foreground .
+   * iOS only
+   */
+   static setShowNotificationsAtForeground(value: boolean) {
+    if (Platform.OS === "ios") {
+      return RNMappPluginModule.setShowNotificationsAtForeground(value);
+    }
+  }
 
   /**
    * Set Custom Attribute
@@ -260,6 +273,14 @@ export class Mapp {
     return RNMappPluginModule.removeBadgeNumber();
   }
 
+  static startGeofencing():Promise<string> {
+    return RNMappPluginModule.startGeofencing();
+  }
+
+  static stopGeofencing() : Promise<string>{
+    return RNMappPluginModule.stopGeofencing();
+  }
+
   static startGeoFencing() {
     return RNMappPluginModule.startGeoFencing();
   }

package/RNMappPlugin.podspec

@@ -16,14 +16,17 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/MappCloud/React-native-plugin", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,c,m,swift}"
-  s.vendored_framework = "ios/Frameworks/AppoxeeSDK.framework", "ios/Frameworks/AppoxeeLocationServices.framework", "ios/Frameworks/AppoxeeInapp.framework"
-  s.resources = "ios/Frameworks/AppoxeeSDKResources.bundle", "ios/Frameworks/AppoxeeInappResources.bundle"
-  s.preserve_path = "ios/Frameworks/"
+  #s.vendored_framework = "ios/Frameworks/AppoxeeSDK.xcframework", "ios/Frameworks/AppoxeeLocationServices.framework", "ios/Frameworks/AppoxeeInapp.framework"
+  #s.resources = "ios/Frameworks/AppoxeeSDKResources.bundle", "ios/Frameworks/AppoxeeInappResources.bundle"
+  #s.preserve_path = "ios/Frameworks/"
   # s.public_header_files = "ios/Frameworks/AppoxeeSDK.framework/Headers/"
   s.requires_arc = true
   s.frameworks = "WebKit"
   s.library = 'sqlite3'
-  s.dependency "React"
+  s.dependency "React" 
+  s.dependency "MappSDK" 
+  s.dependency "MappSDKInapp"
+  s.dependency "MappSDKGeotargeting"
 
 end
 

package/__package.json

@@ -3,10 +3,6 @@
   "version": "1.0.3beta12",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "./iospatch.sh"
-  },
   "keywords": [
     "react-native",
     "react",
@@ -18,12 +14,12 @@
   "author": "Mapp",
   "license": "MIT",
   "peerDependencies": {
-    "react": "^16.8.1",
+    "react": "^18.0.0",
     "react-native": ">=0.60.0-rc.0 <1.0.x"
   },
   "devDependencies": {
     "jest": "^24.9.0",
-    "react": "^16.9.0",
+    "react": "^18.0.0",
     "react-native": "^0.61.5"
   },
   "repository": {

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

@@ -1,11 +1,11 @@
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.0-rc-1))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.1.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-special17'
+}
+

package/android/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
         </receiver>
         <activity
                 android:name=".HelperActivity"
-                android:exported="true"
+                android:exported="false"
                 android:theme="@style/HelperActivityStyle">
 
             <intent-filter android:label="mapp">
@@ -42,7 +42,8 @@
             </intent-filter>
 
         </activity>
-        <service android:name=".MessageService">
+        <service android:name=".MessageService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

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/HelperActivity.java

@@ -1,19 +1,12 @@
 package com.reactlibrary;
 
 import android.app.Activity;
-import android.content.Context;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.ResultReceiver;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.core.content.ContextCompat;
 
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 
@@ -23,22 +16,6 @@ import java.util.Objects;
  */
 public class HelperActivity extends Activity {
 
-    @NonNull
-    public static final String PERMISSIONS_EXTRA = "com.mapp.PERMISSIONS_EXTRA";
-
-    @NonNull
-    public static final String RESULT_RECEIVER_EXTRA = "com.mapp.RESULT_RECEIVER_EXTRA";
-
-    @NonNull
-    public static final String RESULT_INTENT_EXTRA = "com.mapp.RESULT_INTENT_EXTRA";
-
-
-    @NonNull
-    public static final String START_ACTIVITY_INTENT_EXTRA = "com.mapp.START_ACTIVITY_INTENT_EXTRA";
-
-    private ResultReceiver resultReceiver;
-    private static int requestCode = 0;
-
     @Override
     public final void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -49,27 +26,23 @@ public class HelperActivity extends Activity {
             finish();
             return;
         }
-        if (intent.getAction() != null)
-            if (!intent.getAction().equals("")) {
+
+        ComponentName name = intent.getComponent();
+        String packageName = getPackageName();
+
+        if (Objects.equals(name.getPackageName(), packageName)) {
+            if (intent.getAction() != null && !intent.getAction().equals("")) {
                 Intent launchIntent = getDefaultActivityIntent();
-                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();
-            }
-        if (savedInstanceState == null) {
-            Intent startActivityIntent = intent.getParcelableExtra(START_ACTIVITY_INTENT_EXTRA);
-            String[] permissions = intent.getStringArrayExtra(PERMISSIONS_EXTRA);
+                ComponentName launcherComponent = launchIntent.getComponent();
+
+                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);
+                }
 
-            if (startActivityIntent != null) {
-                resultReceiver = intent.getParcelableExtra(RESULT_RECEIVER_EXTRA);
-                startActivityForResult(startActivityIntent, ++requestCode);
-            } else if (Build.VERSION.SDK_INT >= 23 && permissions != null) {
-                resultReceiver = intent.getParcelableExtra(RESULT_RECEIVER_EXTRA);
-                requestPermissions(permissions, ++requestCode);
-            } else {
+                EventEmitter.shared().sendEvent(new IntentNotificationEvent(Objects.requireNonNull(intent.getData()), intent.getAction()));
                 finish();
             }
         }
@@ -86,169 +59,14 @@ public class HelperActivity extends Activity {
         if (intent == null) {
             return;
         }
-        if (intent.getAction() != null)
-            if (!intent.getAction().equals("")) {
-                EventEmitter.shared().sendEvent(new IntentNotificationEvent(Objects.requireNonNull(intent.getData()), intent.getAction()));
-            }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        if (resultReceiver != null) {
-            Bundle bundledData = new Bundle();
-            bundledData.putParcelable(RESULT_INTENT_EXTRA, data);
-            resultReceiver.send(resultCode, bundledData);
-        }
-
-        super.onActivityResult(requestCode, resultCode, data);
-        this.finish();
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-        if (resultReceiver != null) {
-            Bundle bundledData = new Bundle();
-            bundledData.putIntArray(RESULT_INTENT_EXTRA, grantResults);
-            resultReceiver.send(Activity.RESULT_OK, bundledData);
-        }
-
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        finish();
-    }
-
-    /**
-     * Requests permissions.
-     *
-     * @param context     The application context.
-     * @param permissions The permissions to request.
-     * @return The result from requesting permissions.
-     */
-    @WorkerThread
-    @NonNull
-    public static int[] requestPermissions(@NonNull Context context, @NonNull String... permissions) {
-        context = context.getApplicationContext();
-        boolean permissionsDenied = false;
-
-        final int[] result = new int[permissions.length];
-        for (int i = 0; i < result.length; i++) {
-            result[i] = ContextCompat.checkSelfPermission(context, permissions[i]);
-            if (result[i] == PackageManager.PERMISSION_DENIED) {
-                permissionsDenied = true;
-            }
-        }
-
-        if (!permissionsDenied || Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return result;
-        }
-
-        ResultReceiver receiver = new ResultReceiver(new Handler(Looper.getMainLooper())) {
-            @Override
-            public void onReceiveResult(int resultCode, Bundle resultData) {
-                int[] receiverResults = resultData.getIntArray(HelperActivity.RESULT_INTENT_EXTRA);
-                if (receiverResults != null && receiverResults.length == result.length) {
-                    System.arraycopy(receiverResults, 0, result, 0, result.length);
-                }
-
-                synchronized (result) {
-                    result.notify();
-                }
-            }
-        };
-
-        Intent startingIntent = new Intent(context, HelperActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .setPackage(context.getPackageName())
-                .putExtra(HelperActivity.PERMISSIONS_EXTRA, permissions)
-                .putExtra(HelperActivity.RESULT_RECEIVER_EXTRA, receiver);
-
-        synchronized (result) {
-            context.startActivity(startingIntent);
-            try {
-                result.wait();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Starts an activity for a result.
-     *
-     * @param context The application context.
-     * @param intent  The activity to start.
-     * @return The result of the activity in a ActivityResult object.
-     */
-    @NonNull
-    @WorkerThread
-    public static ActivityResult startActivityForResult(@NonNull Context context, @NonNull Intent intent) {
-        context = context.getApplicationContext();
-        final ActivityResult result = new ActivityResult();
-
-        ResultReceiver receiver = new ResultReceiver(new Handler(Looper.getMainLooper())) {
-            @Override
-            public void onReceiveResult(int resultCode, Bundle resultData) {
-                result.setResult(resultCode, (Intent) resultData.getParcelable(HelperActivity.RESULT_INTENT_EXTRA));
-                synchronized (result) {
-                    result.notify();
-                }
-            }
-        };
 
-        Intent startingIntent = new Intent(context, HelperActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .setPackage(context.getPackageName())
-                .putExtra(HelperActivity.START_ACTIVITY_INTENT_EXTRA, intent)
-                .putExtra(HelperActivity.RESULT_RECEIVER_EXTRA, receiver);
+        ComponentName name = intent.getComponent();
+        String packageName = getPackageName();
 
-        synchronized (result) {
-            context.startActivity(startingIntent);
-            try {
-                result.wait();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                return new ActivityResult();
+        if (Objects.equals(name.getPackageName(), packageName)) {
+            if (intent.getAction() != null && !intent.getAction().equals("")) {
+                EventEmitter.shared().sendEvent(new IntentNotificationEvent(Objects.requireNonNull(intent.getData()), intent.getAction()));
             }
         }
-
-        return result;
-    }
-
-    /**
-     * Wraps the result code and data from starting an activity
-     * for a result.
-     */
-    public static class ActivityResult {
-
-        private int resultCode = Activity.RESULT_CANCELED;
-        private Intent intent;
-
-        /**
-         * Gets the result intent.
-         *
-         * @return The result intent from the activity.
-         */
-        @Nullable
-        public Intent getIntent() {
-            return intent;
-        }
-
-        /**
-         * Gets the result code from the activity.
-         *
-         * @return The result code from the activity.
-         */
-        public int getResultCode() {
-            return resultCode;
-        }
-
-        private void setResult(int resultCode, @Nullable Intent intent) {
-            this.resultCode = resultCode;
-            this.intent = intent;
-        }
-
     }
-
-}
-
+}

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

@@ -49,6 +49,4 @@ public class IntentNotificationEvent implements Event {
         this.message = message;
         this.type = type;
     }
-
-
 }

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 = 10;
-        try {
-            while (AppoxeeServiceAdapter.getInstance() == null || !AppoxeeServiceAdapter.getInstance().isQueryReady() || limit != 0) {
-                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 = 10;
-        try {
-            while (AppoxeeServiceAdapter.getInstance() == null || !AppoxeeServiceAdapter.getInstance().isQueryReady() || limit != 0) {
+        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

@@ -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;
@@ -109,7 +111,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     @ReactMethod
       public void setRemoteMessage(String msgJson) {
           RemoteMessage remoteMessage = getRemoteMessage(msgJson);
-          if (remoteMessage != null && Appoxee.instance() != null) {
+          if (remoteMessage != null) {
               Appoxee.instance().setRemoteMessage(remoteMessage);
           }
       }
@@ -127,7 +129,6 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setToken(String token) {
-    if (Appoxee.instance() != null)
         Appoxee.instance().setToken(token);
     }
 
@@ -285,63 +286,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();
@@ -369,8 +345,6 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
                 promise.resolve(messageToJson(message));
             }
         });
-
-
     }
 
     @ReactMethod

package/ios/RNMappEventEmmiter.h

@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <AppoxeeSDK/AppoxeeSDK.h>
-#import <AppoxeeInapp/AppoxeeInapp.h>
-#import <AppoxeeLocationServices/AppoxeeLocationManager.h>
+#import "AppoxeeSDK.h"
+#import "AppoxeeInapp.h"
+#import "AppoxeeLocationManager.h"
 #import <React/RCTEventEmitter.h>
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/RNMappPluginModule.h

@@ -1,8 +1,8 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
-#import <AppoxeeSDK/AppoxeeSDK.h>
-#import <AppoxeeInapp/AppoxeeInapp.h>
-#import <AppoxeeLocationServices/AppoxeeLocationManager.h>
+#import "AppoxeeSDK.h"
+#import "AppoxeeInapp.h"
+#import "AppoxeeLocationManager.h"
 #import <UserNotifications/UNUserNotificationCenter.h>
 
 @interface RNMappPluginModule : NSObject <RCTBridgeModule,AppoxeeInappDelegate, AppoxeeNotificationDelegate, AppoxeeLocationManagerDelegate >

package/ios/RNMappPluginModule.m

@@ -13,6 +13,14 @@
     return [RNMappEventEmmiter shared].bridge;
 }
 
+- (void)setCallableJSModules:(RCTCallableJSModules *)callableJSModules {
+    [RNMappEventEmmiter shared].callableJSModules = callableJSModules;
+}
+
+- (RCTCallableJSModules *)callableJSModules {
+    return [RNMappEventEmmiter shared].callableJSModules;
+}
+
 - (dispatch_queue_t)methodQueue {
     return dispatch_get_main_queue();
 }
@@ -96,6 +104,10 @@ RCT_EXPORT_METHOD(setPostponeNotificationRequest: (BOOL) postpone) {
     [[Appoxee shared] setPostponeNotificationRequest:postpone];
 }
 
+RCT_EXPORT_METHOD(setShowNotificationsAtForeground: (BOOL) value) {
+    [[Appoxee shared] setShowNotificationsOnForeground:value];
+}
+
 RCT_EXPORT_METHOD(showNotificationAlertView) {
     [[Appoxee shared] showNotificationAlertDialog];
 }

package/package.json

@@ -1,12 +1,8 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.0.11-beta1",
+  "version": "1.0.11-beta12",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "./iospatch.sh"
-  },
   "keywords": [
     "react-native",
     "react",
@@ -18,13 +14,13 @@
   "author": "Mapp",
   "license": "MIT",
   "peerDependencies": {
-    "react": "^16.8.1",
+    "react": "^18.0.0",
     "react-native": ">=0.60.0-rc.0 <1.0.x"
   },
   "devDependencies": {
-    "jest": "^24.9.0",
-    "react": "^16.9.0",
-    "react-native": "^0.61.5"
+    "jest": "^28.1.3",
+    "react": "18.0.0",
+    "react-native": "0.69.4"
   },
   "repository": {
     "type": "git",

package/.idea/React-native-plugin.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/React-native-plugin.iml" filepath="$PROJECT_DIR$/.idea/React-native-plugin.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/iostemp" vcs="Git" />
-  </component>
-</project>

package/.idea/workspace.xml

@@ -1,151 +0,0 @@
-<?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="">
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/reactlibrary/MessageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/reactlibrary/MessageService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/reactlibrary/RNMappPluginModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/reactlibrary/RNMappPluginModule.java" 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" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="windows_build" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1uwOd50jND4RNgNpsC9FcxMd94j" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RunManager" selected="Shell Script.iospatch.sh">
-    <configuration name="iospatch.sh" type="ShConfigurationType" temporary="true">
-      <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-      <option name="SCRIPT_PATH" value="$PROJECT_DIR$/iospatch.sh" />
-      <option name="SCRIPT_OPTIONS" value="" />
-      <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-      <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
-      <option name="INTERPRETER_PATH" value="/bin/zsh" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="EXECUTE_IN_TERMINAL" value="true" />
-      <envs />
-      <method v="2" />
-    </configuration>
-    <configuration name="postinstall" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
-      <package-json value="$PROJECT_DIR$/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="postinstall" />
-      </scripts>
-      <node-interpreter value="project" />
-      <envs />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Shell Script.iospatch.sh" />
-        <item itemvalue="npm.postinstall" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="8b4f258a-c093-494f-afe5-5f5a25c90893" name="Default Changelist" comment="" />
-      <created>1625573269544</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1625573269544</updated>
-      <workItem from="1625573273033" duration="26000" />
-      <workItem from="1625580406053" duration="4000" />
-      <workItem from="1625659434437" duration="279000" />
-      <workItem from="1632413120138" duration="665000" />
-      <workItem from="1632874987690" duration="1182000" />
-      <workItem from="1632917248275" duration="2037000" />
-      <workItem from="1632991423561" duration="15597000" />
-      <workItem from="1633566225798" duration="599000" />
-      <workItem from="1634673153825" duration="3131000" />
-      <workItem from="1635406438746" duration="1187000" />
-      <workItem from="1635764727836" duration="3806000" />
-    </task>
-    <task id="LOCAL-00001" summary="new version">
-      <created>1632917445507</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1632917445507</updated>
-    </task>
-    <task id="LOCAL-00002" summary="new version">
-      <created>1633017006065</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1633017006065</updated>
-    </task>
-    <task id="LOCAL-00003" summary="new version">
-      <created>1633076795243</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1633076795243</updated>
-    </task>
-    <task id="LOCAL-00004" summary="Update script to run on all linux systems">
-      <created>1634673619666</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1634673619666</updated>
-    </task>
-    <task id="LOCAL-00005" summary="Update script to run on all linux systems">
-      <created>1635407568834</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1635407568834</updated>
-    </task>
-    <option name="localTasksCounter" value="6" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="COLUMN_ID_WIDTH">
-                <map>
-                  <entry key="Table.Default.Author.ColumnIdWidth" value="129" />
-                  <entry key="Table.Default.Date.ColumnIdWidth" value="129" />
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <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" />
-  </component>
-</project>

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

@@ -1,58 +0,0 @@
-package com.reactlibrary;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Created by Aleksandar Marinkovic on 2019-05-15.
- * Copyright (c) 2019 MAPP.
- */
-
-
-class RequestPermissionsTask extends AsyncTask<String, Void, Boolean> {
-
-    private final Context context;
-    private Callback callback;
-
-    /**
-     * Callback when with the result.
-     */
-    public interface Callback {
-        void onResult(boolean enabled);
-    }
-
-    /**
-     * Creates a request permissions task.
-     *
-     * @param context  The application context.
-     * @param callback The callback.
-     */
-    RequestPermissionsTask(@NonNull Context context, @Nullable Callback callback) {
-        this.context = context;
-        this.callback = callback;
-    }
-
-    @Override
-    protected Boolean doInBackground(String... strings) {
-        int[] result = HelperActivity.requestPermissions(context, strings);
-        for (int element : result) {
-            if (element == PackageManager.PERMISSION_GRANTED) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (callback != null) {
-            callback.onResult(result);
-        }
-    }
-}
-
-

package/iospatch.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-chmod u+x
-if [ -d ios/Frameworks ]; then
-
-	if [ ! -d iostemp ]; then
-  		mkdir -p iostemp;
-	fi
-
-	git clone https://github.com/MappCloud/React-native-plugin --depth 1 --branch=master iostemp
-	cp -RPn iostemp/ios/Frameworks ios
-	rm -rf iostemp
-	echo "Finished pathching iOS"
-fi