react-native-mapp-plugin 1.0.11-beta15 → 1.0.11-beta16

package/Mapp.js

@@ -52,8 +52,8 @@ export class Mapp {
    *
    * @param token
    */
-  static setToken(token: string) {
-    RNMappPluginModule.setToken(token);
+  static setToken(token: string): Promise<Boolean> {
+    return RNMappPluginModule.setToken(token);
   }
 
   /**
@@ -70,7 +70,7 @@ export class Mapp {
    * @param {remoteMessage} push message received
    */
   static setRemoteMessage(remoteMessage: Any) {
-    RNMappPluginModule.setRemoteMessage(JSON.stringify(remoteMessage));
+    return RNMappPluginModule.setRemoteMessage(JSON.stringify(remoteMessage));
   }
 
   /**
@@ -87,8 +87,8 @@ export class Mapp {
    *
    * @param alias
    */
-  static setAlias(alias: string) {
-    RNMappPluginModule.setAlias(alias);
+  static setAlias(alias: string): Promise<Boolean> {
+    return RNMappPluginModule.setAlias(alias);
   }
 
   /**
@@ -280,6 +280,10 @@ export class Mapp {
     return RNMappPluginModule.removeBadgeNumber();
   }
 
+  static requestGeofenceLocationPermission(): Promise<boolean> {
+    return RNMappPluginModule.requestGeofenceLocationPermission();
+  }
+
   static startGeofencing(): Promise<string> {
     return RNMappPluginModule.startGeofencing();
   }

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

@@ -47,6 +47,7 @@ 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;
@@ -112,9 +113,50 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void requestPostNotificationPermission(Promise promise){
+    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;
+                        });
+            } else {
+                //Toast.makeText(activity, "PERMISSION ALREADY GRANTED", Toast.LENGTH_SHORT).show();
+                promise.resolve(true);
+            }
+        } 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();
+            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) -> {
@@ -133,17 +175,19 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
                 //Toast.makeText(activity, "PERMISSION ALREADY GRANTED", Toast.LENGTH_SHORT).show();
                 promise.resolve(true);
             }
-        }else{
+        } else {
             promise.reject("Can't access activity for requesting permission!");
         }
     }
 
     @ReactMethod
-    public void setRemoteMessage(String msgJson) {
+    public void setRemoteMessage(String msgJson, Promise promise) {
         RemoteMessage remoteMessage = getRemoteMessage(msgJson);
         if (remoteMessage != null) {
             Appoxee.instance().setRemoteMessage(remoteMessage);
+            promise.resolve(true);
         }
+        promise.resolve(false);
     }
 
     @ReactMethod
@@ -158,8 +202,9 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setToken(String token) {
+    public void setToken(String token, Promise promise) {
         Appoxee.instance().setToken(token);
+        promise.resolve(true);
     }
 
     @ReactMethod
@@ -173,14 +218,14 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setAlias(String alias) {
+    public void setAlias(String alias, Promise promise) {
         Appoxee.instance().setAlias(alias);
+        promise.resolve(true);
     }
 
     @ReactMethod
     public void engage2() {
         Appoxee.engage(Objects.requireNonNull(application));
-
     }
 
     @ReactMethod
@@ -212,7 +257,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;
@@ -414,8 +459,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));
@@ -448,22 +493,22 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void getDeviceDmcInfo(final Promise promise){
+    public void getDeviceDmcInfo(final Promise promise) {
         try {
-            Map<String, String> map= Appoxee.instance().getDmcDeviceInfo();
-            WritableMap wm=new WritableNativeMap();
-            for(Map.Entry<String, String> item : map.entrySet()){
-                wm.putString(item.getKey(),item.getValue());
+            Map<String, String> map = Appoxee.instance().getDmcDeviceInfo();
+            WritableMap wm = new WritableNativeMap();
+            for (Map.Entry<String, String> item : map.entrySet()) {
+                wm.putString(item.getKey(), item.getValue());
             }
             promise.resolve(wm);
         } catch (Exception e) {
-            promise.reject("Error getting DMC Info",e);
+            promise.reject("Error getting DMC Info", e);
         }
     }
 
     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.
@@ -591,7 +636,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/package.json

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