infobip-mobile-messaging-react-native-plugin 12.2.0 → 12.3.0

package/android/build.gradle

@@ -11,7 +11,6 @@ def overrideGmsVersion = getRootProjectProperty('overrideGmsVersion', '')
 def overrideFirebaseVersion = getRootProjectProperty('overrideFirebaseVersion', '')
 def overrideKotlinVersion = getRootProjectProperty('overrideKotlinVersion', '')
 def withCryptorMigration = getRootProjectProperty('withCryptorMigration', false)
-def withGeofencingModule = getRootProjectProperty('withGeofencingModule', false)
 def withWebRTCUI = getRootProjectProperty('withWebRTCUI', false)
 
 apply plugin: 'com.android.library'
@@ -131,9 +130,4 @@ dependencies {
         implementation "com.infobip:infobip-mobile-messaging-android-cryptor-migration:$mmVersion@aar"
     }
 
-    if (withGeofencingModule.toBoolean()) {
-        implementation ("com.infobip:infobip-mobile-messaging-android-geo-sdk:$mmVersion@aar"){
-            transitive = true
-        }
-    }
 }

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/Configuration.java

@@ -94,7 +94,6 @@ class Configuration {
 
     AndroidConfiguration android;
     String applicationCode;
-    boolean geofencingEnabled;
     boolean inAppChatEnabled;
     boolean fullFeaturedInAppsEnabled;
     Map<String, ?> messageStorage;

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java

@@ -161,7 +161,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private static final String EVENT_PERSONALIZED = "personalized";
     private static final String EVENT_DEPERSONALIZED = "depersonalized";
 
-    private static final String EVENT_GEOFENCE_ENTERED = "geofenceEntered";
     private static final String EVENT_NOTIFICATION_TAPPED = "notificationTapped";
     private static final String EVENT_NOTIFICATION_ACTION_TAPPED = "actionTapped";
     private static final String EVENT_MESSAGE_RECEIVED = "messageReceived";
@@ -173,9 +172,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private static final String EVENT_INAPPCHAT_AVAILABILITY_UPDATED = "inAppChat.availabilityUpdated";
     //endregion
 
-    //Geo dependency is opt-out by default. Extracted from GeoEvent.GEOFENCE_AREA_ENTERED module 'infobip-mobile-messaging-android-geo-sdk'
-    private static final String GEO_EVENT_GEOFENCE_AREA_ENTERED_KEY = "org.infobip.mobile.messaging.geo.GEOFENCE_AREA_ENTERED";
-
 
     //region MessageStorageBroadcastReceiver
     private static final Map<String, String> messageStorageEventMap = new HashMap<String, String>() {{
@@ -296,7 +292,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         put(Event.USER_UPDATED.getKey(), EVENT_USER_UPDATED);
         put(Event.PERSONALIZED.getKey(), EVENT_PERSONALIZED);
         put(Event.DEPERSONALIZED.getKey(), EVENT_DEPERSONALIZED);
-        put(GEO_EVENT_GEOFENCE_AREA_ENTERED_KEY, EVENT_GEOFENCE_ENTERED);
         put(InAppChatEvent.CHAT_VIEW_CHANGED.getKey(), EVENT_INAPPCHAT_VIEW_STATE_CHANGED);
         put(InAppChatEvent.CHAT_CONFIGURATION_SYNCED.getKey(), EVENT_INAPPCHAT_CONFIGURATION_SYNCED);
         put(InAppChatEvent.LIVECHAT_REGISTRATION_ID_UPDATED.getKey(), EVENT_INAPPCHAT_LIVECHAT_REGISTRATION_ID_UPDATED);
@@ -313,13 +308,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
                 return;
             }
 
-            if (GEO_EVENT_GEOFENCE_AREA_ENTERED_KEY.equals(intent.getAction())) {
-                for (JSONObject geo : MessageJson.geosFromBundle(intent.getExtras())) {
-                    ReactNativeEvent.send(event, reactContext, geo);
-                }
-                return;
-            }
-
             if (Event.INSTALLATION_UPDATED.getKey().equals(intent.getAction())) {
                 JSONObject updatedInstallation = InstallationJson.toJSON(Installation.createFrom(intent.getExtras()));
                 ReactNativeEvent.send(event, reactContext, updatedInstallation);
@@ -471,19 +459,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             @SuppressLint("MissingPermission")
             @Override
             public void onSuccess() {
-                if (configuration.geofencingEnabled) {
-                    try {
-                        Class<?> cls = Class.forName("org.infobip.mobile.messaging.geo.MobileGeo");
-                        Method newInstance_method = cls.getDeclaredMethod("getInstance", Context.class);
-                        Method activateGeofencing_method = cls.getDeclaredMethod("activateGeofencing");
-                        Object geoInstance = newInstance_method.invoke(cls, context);
-                        activateGeofencing_method.invoke(geoInstance);
-                    } catch (Exception e) {
-                        Log.d(Utils.TAG, "Geofencing is not enabled.");
-                        e.printStackTrace();
-                    }
-                }
-
                 NotificationCategory categories[] = notificationCategoriesFromConfiguration(configuration.notificationCategories);
                 if (categories.length > 0) {
                     MobileInteractive.getInstance(context).setNotificationCategories(categories);

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/datamappers/MessageJson.java

@@ -54,7 +54,6 @@ public class MessageJson {
                     .putOpt("contentUrl", message.getContentUrl())
                     .putOpt("seen", message.getSeenTimestamp() != 0)
                     .putOpt("seenDate", message.getSeenTimestamp())
-                    .putOpt("geo", hasGeo(message))
                     .putOpt("chat", message.isChatMessage())
                     .putOpt("browserUrl", message.getBrowserUrl())
                     .putOpt("webViewUrl", message.getWebViewUrl())
@@ -68,19 +67,6 @@ public class MessageJson {
         }
     }
 
-    private static boolean hasGeo(Message message) {
-        if (message == null || message.getInternalData() == null) {
-            return false;
-        }
-
-        try {
-            JSONObject geo = new JSONObject(message.getInternalData());
-            return geo.getJSONArray("geo") != null && geo.getJSONArray("geo").length() > 0;
-        } catch (JSONException e) {
-            return false;
-        }
-    }
-
     /**
      * Creates array of json objects from list of messages
      *
@@ -135,26 +121,6 @@ public class MessageJson {
         return message;
     }
 
-    /**
-     * Geo mapper
-     *
-     * @param bundle where to read geo objects from
-     * @return list of json objects representing geo objects
-     */
-    @NonNull
-    public static List<JSONObject> geosFromBundle(Bundle bundle) {
-        try {
-            Class<?> cls = Class.forName("org.infobip.mobile.messaging.geo.mapper.GeoBundleMapper");
-            Method geosFromBundle_method = cls.getDeclaredMethod("geosFromBundle", Bundle.class);
-            List<JSONObject> geos = (List<JSONObject>) geosFromBundle_method.invoke(cls, bundle);
-            return geos;
-        } catch (Exception e) {
-            Log.w(Utils.TAG, "Cannot convert geo to JSON: " + e.getMessage());
-            Log.d(Utils.TAG, Log.getStackTraceString(e));
-        }
-        return new ArrayList<JSONObject>();
-    }
-
     @NonNull
     public static List<Message> resolveMessages(JSONArray args) throws JSONException {
         if (args == null || args.length() < 1 || args.getString(0) == null) {

package/infobip-mobile-messaging-react-native-plugin.podspec

@@ -20,7 +20,6 @@ Pod::Spec.new do |s|
 
   s.dependency "React-Core"
   s.dependency "MobileMessaging/Core", "12.13.2"
-  s.dependency "MobileMessaging/Geofencing", "12.13.2"
   s.dependency "MobileMessaging/InAppChat", "12.13.2"
   s.dependency "MobileMessaging/Inbox", "12.13.2"
   if defined?($WebRTCUIEnabled)

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -27,7 +27,6 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
             EventName.userUpdated,
             EventName.personalized,
             EventName.depersonalized,
-            EventName.geofenceEntered,
             EventName.actionTapped,
             EventName.notificationTapped,
             EventName.messageReceived,
@@ -123,10 +122,6 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
 
         var mobileMessaging = MobileMessaging.withApplicationCode(configuration.appCode, notificationType: configuration.notificationType)
 
-        if configuration.geofencingEnabled {
-            mobileMessaging = mobileMessaging?.withGeofencingService()
-        }
-
         if let storageAdapter = messageStorageAdapter, configuration.messageStorageEnabled {
             mobileMessaging = mobileMessaging?.withMessageStorage(storageAdapter)
         } else if configuration.defaultMessageStorage {

package/ios/MobileMessagingPlugin/RNMobileMessagingConfiguration.swift

@@ -17,7 +17,6 @@ class RNMobileMessagingConfiguration {
         static let carrierInfoSendingDisabled = "carrierInfoSendingDisabled"
         static let systemInfoSendingDisabled = "systemInfoSendingDisabled"
         static let applicationCodePersistingDisabled = "applicationCodePersistingDisabled"
-        static let geofencingEnabled = "geofencingEnabled"
         static let applicationCode = "applicationCode"
         static let webRTCUI = "webRTCUI"
         static let configurationId = "configurationId"
@@ -34,7 +33,6 @@ class RNMobileMessagingConfiguration {
 
     let appCode: String
     let webRTCUI: [String: AnyObject]?
-    let geofencingEnabled: Bool
     let messageStorageEnabled: Bool
     let defaultMessageStorage: Bool
     let notificationType: MMUserNotificationType
@@ -55,7 +53,6 @@ class RNMobileMessagingConfiguration {
 
         self.appCode = appCode
         self.webRTCUI = rawConfig[RNMobileMessagingConfiguration.Keys.webRTCUI] as? [String: AnyObject]
-        self.geofencingEnabled = rawConfig[RNMobileMessagingConfiguration.Keys.geofencingEnabled].unwrap(orDefault: false)
         self.logging = ios[RNMobileMessagingConfiguration.Keys.logging].unwrap(orDefault: false)
         self.defaultMessageStorage = rawConfig[RNMobileMessagingConfiguration.Keys.defaultMessageStorage].unwrap(orDefault: false)
         self.messageStorageEnabled = rawConfig[RNMobileMessagingConfiguration.Keys.messageStorage] != nil ? true : false

package/ios/MobileMessagingPlugin/RNMobileMessagingEventsManager.swift

@@ -17,7 +17,6 @@ class RNMobileMessagingEventsManager {
         EventName.messageReceived: MMNotificationMessageReceived,
         EventName.tokenReceived:  MMNotificationDeviceTokenReceived,
         EventName.registrationUpdated:  MMNotificationRegistrationUpdated,
-        EventName.geofenceEntered: MMNotificationGeographicalRegionDidEnter,
         EventName.notificationTapped: MMNotificationMessageTapped,
         EventName.actionTapped: MMNotificationActionTapped,
         EventName.depersonalized: MMNotificationDepersonalized,
@@ -85,11 +84,6 @@ class RNMobileMessagingEventsManager {
             if let internalId = notification.userInfo?[MMNotificationKeyRegistrationInternalId] as? String {
                 notificationResult = internalId
             }
-        case MMNotificationGeographicalRegionDidEnter:
-            eventName = EventName.geofenceEntered
-           if let region = notification.userInfo?[MMNotificationKeyGeographicalRegion] as? MMRegion {
-               notificationResult = region.dictionary()
-           }
         case MMNotificationMessageTapped:
             eventName = EventName.notificationTapped
             if let message = notification.userInfo?[MMNotificationKeyMessage] as? MM_MTMessage {

package/ios/MobileMessagingPlugin/RNMobileMessagingUtils.swift

@@ -21,7 +21,6 @@ extension MM_MTMessage {
         result["contentUrl"] = contentUrl
         result["seen"] = seenStatus != .NotSeen
         result["seenDate"] = seenDate?.timeIntervalSince1970
-        result["geo"] = isGeoMessage
         result["chat"] = isChatMessage
         result["browserUrl"] = browserUrl?.absoluteString
         result["deeplink"] = deeplink?.absoluteString
@@ -31,10 +30,6 @@ extension MM_MTMessage {
         return result
     }
 
-    var isGeoMessage: Bool {
-        let geoAreasDicts = (originalPayload["internalData"] as? [String: Any])?["geo"] as? [[String: Any]]
-        return geoAreasDicts != nil
-    }
 }
 
 extension MMInbox {
@@ -80,24 +75,6 @@ extension MMBaseMessage {
     }
 }
 
-extension MMRegion {
-    func dictionary() -> [String: Any] {
-        var areaCenter = [String: Any]()
-        areaCenter["lat"] = center.latitude
-        areaCenter["lon"] = center.longitude
-
-        var area = [String: Any]()
-        area["id"] = identifier
-        area["center"] = areaCenter
-        area["radius"] = radius
-        area["title"] = title
-
-        var result = [String: Any]()
-        result["area"] = area
-        return result
-    }
-}
-
 extension Optional {
     func unwrap<T>(orDefault fallbackValue: T) -> T {
         switch self {
@@ -116,7 +93,6 @@ struct EventName {
     static let userUpdated = "userUpdated"
     static let personalized = "personalized"
     static let depersonalized = "depersonalized"
-    static let geofenceEntered = "geofenceEntered"
     static let actionTapped = "actionTapped"
     static let notificationTapped = "notificationTapped"
     static let messageReceived = "messageReceived"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -7,7 +7,6 @@ declare namespace MobileMessagingReactNative {
         'notificationTapped' |
         'tokenReceived' |
         'registrationUpdated' |
-        'geofenceEntered' |
         'actionTapped' |
         'installationUpdated' |
         'userUpdated' |
@@ -26,7 +25,6 @@ declare namespace MobileMessagingReactNative {
         webRTCUI?: {
             configurationId: string;
         } | undefined;
-        geofencingEnabled?: boolean | undefined;
         inAppChatEnabled?: boolean | undefined;
         fullFeaturedInAppsEnabled?: boolean | undefined;
         /**
@@ -94,7 +92,6 @@ declare namespace MobileMessagingReactNative {
         isPrimaryDevice?: boolean | undefined;
         isPushRegistrationEnabled?: boolean | undefined;
         notificationsEnabled?: boolean | undefined;
-        geoEnabled?: boolean | undefined;
         sdkVersion?: string | undefined;
         appVersion?: string | undefined;
         os?: OS | undefined;
@@ -134,22 +131,6 @@ declare namespace MobileMessagingReactNative {
         forceDepersonalize?: boolean | undefined;
     }
 
-    export interface GeoData {
-        area: GeoArea;
-    }
-
-    export interface GeoArea {
-        id: string;
-        center: GeoCenter;
-        radius: number;
-        title: string;
-    }
-
-    export interface GeoCenter {
-        lat: number;
-        lon: number;
-    }
-
     export interface Message {
         messageId: string;
         title?: string | undefined;
@@ -162,7 +143,6 @@ declare namespace MobileMessagingReactNative {
         seenDate?: number | undefined;
         contentUrl?: string | undefined;
         seen?: boolean | undefined;
-        geo?: boolean | undefined;
         originalPayload?: Record<string, string> | undefined; // iOS only
         vibrate?: boolean | undefined; // Android only
         icon?: string | undefined; // Android only
@@ -360,7 +340,6 @@ declare namespace MobileMessagingReactNative {
             "notificationTapped",
             "tokenReceived",
             "registrationUpdated",
-            "geofenceEntered",
             "actionTapped",
             "installationUpdated",
             "userUpdated",
@@ -679,15 +658,6 @@ declare namespace MobileMessagingReactNative {
          */
         setJwtProvider(jwtProvider: () => string): void;
 
-        /**
-         * This is used for requesting Location permissions for Android
-         * @param rationale rationale to display if it's needed. Describing why this permissions required.
-         * Mobile Messaging SDK requires following permissions to be able to send geo targeted notifications, even if application is killed or on background.
-         * ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION, ACCESS_BACKGROUND_LOCATION
-         * @return
-         */
-        requestAndroidLocationPermissions(rationale ?: Rationale): Promise<boolean>;
-
         /**
          * Registering for POST_NOTIFICATIONS permission for Android 13+
          */

package/src/index.js

@@ -2,11 +2,8 @@ import {
     EmitterSubscription,
     NativeEventEmitter,
     NativeModules,
-    Permission,
-    PermissionsAndroid,
     Platform,    
 } from 'react-native';
-import type {Rationale} from 'react-native/Libraries/PermissionsAndroid/PermissionsAndroid';
 
 
 const { ReactNativeMobileMessaging, RNMMChat, RNMMWebRTCUI } = NativeModules;
@@ -23,7 +20,6 @@ class MobileMessaging {
             "notificationTapped",
             "tokenReceived",
             "registrationUpdated",
-            "geofenceEntered",
             "actionTapped",
             "installationUpdated",
             "userUpdated",
@@ -55,7 +51,6 @@ class MobileMessaging {
      *   - notificationTapped
      *   - tokenReceived
      *   - registrationUpdated
-     *	 - geofenceEntered
      *	 - actionTapped
      *	 - installationUpdated
      *	 - userUpdated
@@ -91,7 +86,6 @@ class MobileMessaging {
      *   - notificationTapped
      *   - tokenReceived
      *   - registrationUpdated
-     *	 - geofenceEntered
      *	 - actionTapped
      *	 - installationUpdated
      *	 - userUpdated
@@ -143,7 +137,6 @@ class MobileMessaging {
      *		webRTCUI: {
      *			configurationId: <String>
      *		},
-     *		geofencingEnabled: true,
      *		messageStorage: '<Message storage save callback>',
      *		defaultMessageStorage: true,
      *	    fullFeaturedInAppsEnabled: true,
@@ -353,7 +346,6 @@ class MobileMessaging {
      *   isPrimaryDevice: true,
      *   isPushRegistrationEnabled: true,
      *   notificationsEnabled: true,
-     *   geoEnabled: false,
      *   sdkVersion: "1.2.3",
      *   appVersion: "2.3.4"
      *   os: "iOS",
@@ -707,63 +699,6 @@ class MobileMessaging {
         ReactNativeMobileMessaging.registerForAndroidRemoteNotifications();
     };
 
-    /* Geofencing permissions */
-
-    /**
-     * This is used for requesting Location permissions for Android
-     * @param rationale rationale to display if it's needed. Describing why this permissions required.
-     * Mobile Messaging SDK requires following permissions to be able to send geo targeted notifications, even if application is killed or on background.
-     * ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION, ACCESS_BACKGROUND_LOCATION
-     * @return {Promise<boolean>}
-     */
-    async requestAndroidLocationPermissions(rationale?: Rationale): Promise<Boolean> {
-        const requiredPermissions = await this.requiredAndroidLocationPermissions();
-        if (requiredPermissions.length === 0) {
-            return Promise.resolve(true);
-        }
-
-        return this.checkAndroidLocationPermission(requiredPermissions, rationale).then(granted => {
-            if (!granted) {
-                return Promise.resolve(false);
-            } else {
-                return this.requestAndroidLocationPermissions(rationale);
-            }
-        });
-    };
-
-    async checkAndroidLocationPermission(permissions: Array<Permission>, rationale?: Rationale): Promise<Boolean> {
-        for (permission of permissions) {
-            const granted = await PermissionsAndroid.request(permission, rationale);
-            if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-                console.log("Permissions Result != Granted ", permission, granted);
-                return Promise.resolve(false);
-            }
-        }
-        console.log("Permissions Result == Granted ");
-        return Promise.resolve(true);
-    };
-
-    async requiredAndroidLocationPermissions(): Promise<Array<Permission>> {
-        let permissions: Array<Permission> = [];
-        const fineLocationGranted = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION);
-        if (!fineLocationGranted) {
-            if (Platform.Version > 29) {
-                permissions = [PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION, PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION];
-            } else if (Platform.Version === 29) {
-                permissions = [PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION, PermissionsAndroid.PERMISSIONS.ACCESS_BACKGROUND_LOCATION];
-            } else {
-                permissions = [PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION];
-            }
-        } else {
-            const backgroundLocationGranted = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.ACCESS_BACKGROUND_LOCATION);
-            if (!backgroundLocationGranted && Platform.Version > 29) {
-                permissions = [PermissionsAndroid.PERMISSIONS.ACCESS_BACKGROUND_LOCATION];
-            }
-        }
-
-        return Promise.resolve(permissions);
-    };
-
     /**
      * This method is iOS only and it has no effect in Android.
      * Used to reset the In-app chat connection. The correct usage is to call it after stopConnection, when we want the messages to reappear, and push