infobip-mobile-messaging-react-native-plugin 7.0.0 → 7.0.2

package/README.md

@@ -22,7 +22,7 @@ For iOS project:
 For Android project:
 - Android Studio (Bumblebee | 2021.1.1)
 - Gradle (v7.3.3)
-- Supported API Levels: 21 (Android 5.0 - [Lollipop](https://developer.android.com/about/versions/lollipop)) - 31 (Android 12.0)
+- Supported API Levels: 21 (Android 5.0 - [Lollipop](https://developer.android.com/about/versions/lollipop)) - 33 (Android 13.0)
 
 ## Quick start guide
 
@@ -96,6 +96,10 @@ This guide is designed to get you up and running with Mobile Messaging SDK plugi
        > </manifest>
        > ```
 
+     > ### Notice (when targeting Android 13):
+     >  Starting from Android 13, Google requires to ask user for notification permission. Follow [this guide](https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Android-13-Notification-Permission-Handling) to make a permission request.
+       
+
 ## Initialization configuration
 
 Initialize Mobile Messaging React Native plugin, provide application configuration in init method:

package/android/build.gradle

@@ -85,7 +85,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '7.2.4'
+    def mmVersion = '7.3.1'
 
     implementation 'com.facebook.react:react-native:+'
     implementation "androidx.annotation:annotation:1.1.0"

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

@@ -0,0 +1,158 @@
+package org.infobip.reactlibrary.mobilemessaging;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.collection.ArraySet;
+
+import com.facebook.react.modules.core.PermissionAwareActivity;
+import com.facebook.react.modules.core.PermissionListener;
+
+import org.infobip.mobile.messaging.R;
+import org.infobip.mobile.messaging.logging.MobileMessagingLogger;
+import org.infobip.mobile.messaging.permissions.PermissionsHelper;
+
+import java.util.Set;
+
+public class PermissionsRequestManager {
+    public interface PermissionsRequester {
+
+        /**
+         * This method will be called when required permissions are granted.
+         */
+        void onPermissionGranted();
+
+        /**
+         * Provide permissions which you need to request.
+         * <br>
+         * For example:
+         * <pre>
+         * {@code
+         * new String[]{Manifest.permission.CAMERA}
+         * </pre>
+         **/
+        @NonNull
+        String[] requiredPermissions();
+
+        /**
+         * Should application show the dialog with information that not all required permissions are granted and button which leads to the settings for granting permissions after it was already shown once.
+         * Recommendations:
+         * - If you are asking for permissions by button tap, better to return true, so user will be informed, why an action can't be done, if the user didn't grant the permissions.
+         * - If you are asking for permissions on the application start, without any additional user actions, better to return false not to disturb the user constantly.
+         **/
+        boolean shouldShowPermissionsNotGrantedDialogIfShownOnce();
+
+        /**
+         * This method is for providing custom title for the permissions dialog.
+         *
+         * @return reference to string resource for permissions dialog title
+         */
+        @StringRes
+        int permissionsNotGrantedDialogTitle();
+
+        /**
+         * This method is for providing custom message for the permissions dialog.
+         *
+         * @return reference to string resource for permissions dialog message
+         */
+        @StringRes
+        int permissionsNotGrantedDialogMessage();
+    }
+
+    protected PermissionsRequester permissionsRequester;
+    protected PermissionsHelper permissionsHelper;
+    protected static final int REQ_CODE_POST_NOTIFICATIONS_PERMISSIONS = 10000;
+
+    public PermissionsRequestManager(@NonNull PermissionsRequester permissionsRequester) {
+        this.permissionsRequester = permissionsRequester;
+        this.permissionsHelper = new PermissionsHelper();
+    }
+
+    public void onRequestPermissionsResult(String[] permissions, int[] grantResults) {
+        for (int result : grantResults) {
+            if (result == -1) return;
+        }
+        permissionsRequester.onPermissionGranted();
+    }
+
+    public boolean isRequiredPermissionsGranted(PermissionAwareActivity activity, PermissionListener listener) {
+        final Set<String> permissionsToAsk = new ArraySet<>();
+        final Set<String> neverAskPermissions = new ArraySet<>();
+
+        for (String permission : permissionsRequester.requiredPermissions()) {
+            if (!permissionsHelper.hasPermissionInManifest((Activity) activity, permission)) {
+                return false;
+            }
+            checkPermission(activity, permission, permissionsToAsk, neverAskPermissions);
+        }
+
+        if (neverAskPermissions.size() > 0) {
+            showSettingsDialog(activity, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    openSettings((Activity) activity);
+                    dialog.dismiss();
+                }
+            }, neverAskPermissions.toString());
+            return false;
+        }
+        String[] permissionsToAskArray = new String[permissionsToAsk.size()];
+        permissionsToAsk.toArray(permissionsToAskArray);
+        if (permissionsToAsk.size() > 0) {
+            activity.requestPermissions(permissionsToAskArray, REQ_CODE_POST_NOTIFICATIONS_PERMISSIONS, listener);
+            return false;
+        }
+        return true;
+    }
+
+    protected void checkPermission(PermissionAwareActivity activity, String permission, final Set<String> permissionsToAsk, final Set<String> neverAskPermissions) {
+        permissionsHelper.checkPermission((Activity) activity, permission, new PermissionsHelper.PermissionsRequestListener() {
+            @Override
+            public void onNeedPermission(Activity activity, String permission) {
+                permissionsToAsk.add(permission);
+            }
+
+            @Override
+            public void onPermissionPreviouslyDeniedWithNeverAskAgain(Activity activity, String permission) {
+                neverAskPermissions.add(permission);
+            }
+
+            @Override
+            public void onPermissionGranted(Activity activity, String permission) {
+            }
+        });
+    }
+
+    protected void showSettingsDialog(PermissionAwareActivity activity, DialogInterface.OnClickListener onPositiveButtonClick, String permission) {
+        if (!permissionsHelper.isPermissionSettingsDialogShown((Activity) activity, permission) ||
+                permissionsRequester.shouldShowPermissionsNotGrantedDialogIfShownOnce()) {
+            AlertDialog.Builder builder = new AlertDialog.Builder((Activity) activity)
+                    .setMessage(permissionsRequester.permissionsNotGrantedDialogMessage())
+                    .setTitle(permissionsRequester.permissionsNotGrantedDialogTitle())
+                    .setPositiveButton(R.string.mm_button_settings, onPositiveButtonClick)
+                    .setNegativeButton(R.string.mm_button_cancel, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                        }
+                    });
+            builder.show();
+            permissionsHelper.setPermissionSettingsDialogShown((Activity) activity, permission, true);
+        }
+    }
+
+    protected void openSettings(Activity activity) {
+        MobileMessagingLogger.d("Will open application settings activity");
+        Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
+        intent.setData(uri);
+        if (intent.resolveActivity(activity.getPackageManager()) != null) {
+            activity.startActivity(intent);
+        }
+    }
+}

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

@@ -8,17 +8,15 @@ import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
-import java.util.Map;
-
 class RNMMChatViewManager extends ViewGroupManager<ReactChatView> {
+    public static final String COMMAND_ADD = "add";
+    public static final String COMMAND_REMOVE = "remove";
+
     public static final String VIEW_GROUP_MANAGER_NAME = "RNMMChatView";
-    public static final int COMMAND_ADD = 1;
-    public static final int COMMAND_REMOVE = 2;
     private ReactApplicationContext context;
 
     @Nullable
@@ -41,26 +39,17 @@ class RNMMChatViewManager extends ViewGroupManager<ReactChatView> {
         return chatView;
     }
 
-    @Nullable
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        return MapBuilder.of(
-                "add", COMMAND_ADD,
-                "remove", COMMAND_REMOVE
-        );
-    }
-
     @Override
     public void receiveCommand(@NonNull ReactChatView root, String commandId, @Nullable ReadableArray args) {
         super.receiveCommand(root, commandId, args);
-        int commandIdInt = Integer.parseInt(commandId);
+
         if (args == null) {
             Log.e(Utils.TAG, "RNMMChatViewManager received command without argumnents, Id: " + commandId);
             return;
         }
         int reactNativeViewId = args.getInt(0);
 
-        switch (commandIdInt) {
+        switch (commandId) {
             case COMMAND_ADD:
                 addChatFragment(root, reactNativeViewId);
                 break;

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

@@ -1,5 +1,6 @@
 package org.infobip.reactlibrary.mobilemessaging;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
@@ -10,6 +11,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Color;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -28,6 +30,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.modules.core.PermissionAwareActivity;
+import com.facebook.react.modules.core.PermissionListener;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
@@ -76,22 +79,26 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule implements LifecycleEventListener, ActivityEventListener {
+public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule implements LifecycleEventListener,
+        ActivityEventListener,
+        PermissionsRequestManager.PermissionsRequester,
+        PermissionListener {
     public static final String MODULE_NAME = "ReactNativeMobileMessaging";
 
     private final ReactApplicationContext reactContext;
 
     private static volatile Boolean broadcastReceiverRegistered = false;
     private static volatile Boolean pluginInitialized = false;
+    private PermissionsRequestManager permissionsRequestManager;
 
     public ReactNativeMobileMessagingModule(ReactApplicationContext reactContext) {
         super(reactContext);
-
         while (getReactApplicationContext() == null) ;
         reactContext = getReactApplicationContext();
 
         this.reactContext = reactContext;
         reactContext.addLifecycleEventListener(this);
+        permissionsRequestManager = new PermissionsRequestManager(this);
     }
 
     @Override
@@ -328,8 +335,8 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         PreferenceHelper.saveString(context, MobileMessagingProperty.SYSTEM_DATA_VERSION_POSTFIX, "reactNative " + configuration.reactNativePluginVersion);
 
         MobileMessaging.Builder builder = new MobileMessaging.Builder(context)
-                .withApplicationCode(configuration.applicationCode)
-                .withoutRegisteringForRemoteNotifications();
+                .withoutRegisteringForRemoteNotifications()
+                .withApplicationCode(configuration.applicationCode);
 
         if (configuration.privacySettings.userDataPersistingDisabled) {
             builder.withoutStoringUserData();
@@ -717,20 +724,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
 
     @ReactMethod
     public void registerForAndroidRemoteNotifications() {
-        mobileMessaging().registerForRemoteNotifications((Activity) getPermissionAwareActivity());
-    }
-
-    private PermissionAwareActivity getPermissionAwareActivity() {
         Activity activity = getCurrentActivity();
-        if (activity == null) {
-            throw new IllegalStateException(
-                    "Tried to use permissions API while not attached to an " + "Activity.");
-        } else if (!(activity instanceof PermissionAwareActivity)) {
-            throw new IllegalStateException(
-                    "Tried to use permissions API but the host Activity doesn't"
-                            + " implement PermissionAwareActivity.");
+        if (activity != null && (activity instanceof PermissionAwareActivity)) {
+            permissionsRequestManager.isRequiredPermissionsGranted((PermissionAwareActivity) activity, this);
+        } else {
+            Log.e(Utils.TAG, "Cannot register for remote notifications because activity isn't exist");
         }
-        return (PermissionAwareActivity) activity;
     }
 
     private static void runInBackground(final Runnable runnable) {
@@ -972,4 +971,43 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             }
         };
     }
+
+    // PermissionsRequester for Post Notifications Permission
+
+    @Override
+    public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PermissionsRequestManager.REQ_CODE_POST_NOTIFICATIONS_PERMISSIONS) {
+            permissionsRequestManager.onRequestPermissionsResult(permissions, grantResults);
+        }
+        return true;
+    }
+
+    @Override
+    public void onPermissionGranted() {
+        Log.i(Utils.TAG, "Post Notifications permission granted");
+    }
+
+    @NonNull
+    @Override
+    public String[] requiredPermissions() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return new String[]{Manifest.permission.POST_NOTIFICATIONS};
+        }
+        return new String[0];
+    }
+
+    @Override
+    public boolean shouldShowPermissionsNotGrantedDialogIfShownOnce() {
+        return true;
+    }
+
+    @Override
+    public int permissionsNotGrantedDialogTitle() {
+        return org.infobip.mobile.messaging.resources.R.string.mm_post_notifications_settings_title;
+    }
+
+    @Override
+    public int permissionsNotGrantedDialogMessage() {
+        return org.infobip.mobile.messaging.resources.R.string.mm_post_notifications_settings_message;
+    }
 }

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

@@ -19,8 +19,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "MobileMessaging/Core", "10.5.3"
-  s.dependency "MobileMessaging/Geofencing", "10.5.3"
-  s.dependency "MobileMessaging/InAppChat", "10.5.3"
+  s.dependency "MobileMessaging/Core", "10.7.0"
+  s.dependency "MobileMessaging/Geofencing", "10.7.0"
+  s.dependency "MobileMessaging/InAppChat", "10.7.0"
 
 end

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Infobip Mobile Messaging React Native Plugin",
-  "main": "index.js",
+  "main": "./src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

package/src/components/RNMMChatViewNativeComponent.js

@@ -0,0 +1,58 @@
+import PropTypes from 'prop-types';
+import React, { FC, useLayoutEffect, useRef } from "react";
+import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {findNodeHandle, requireNativeComponent} from 'react-native'
+
+interface RNMMChatViewProps {
+    sendButtonColor: ?string
+}
+
+const RNMMChatViewCommands = codegenNativeCommands({
+    supportedCommands: ["add", "remove"],
+});
+
+export const ChatView: FC<RNMMChatViewProps> = props => {
+    const ref = useRef(null);
+
+    useLayoutEffect(() => {
+        // Not needed for iOS.
+        if (Platform.OS === "ios") return;
+
+        const chatViewRef = ref.current
+        // Nothing to do if there is no chatView reference.
+        if (!chatViewRef) return;
+
+        let addedViewId: ?number = null
+
+        // Fix for android, sometimes it can't get parent view, which is needed
+        // for proper relayout.
+        setTimeout(() => {
+            const viewId = findNodeHandle(chatViewRef);
+            if (viewId !== null && viewId !== undefined) {
+                RNMMChatViewCommands.add(chatViewRef, viewId);
+                console.log(`Adding android viewId: ${viewId}.`);
+                addedViewId = viewId;
+            }
+        }, 100);
+
+        return () => {
+            const viewId = addedViewId
+            if (viewId !== null && viewId !== undefined) {
+                console.log(`Removing android viewId: ${viewId}.`);
+                RNMMChatViewCommands.remove(chatViewRef, viewId);
+            }
+        };
+    }, []);
+
+    return <RNMMChatView {...props} ref={ref} />;
+};
+
+ChatView.propTypes = {
+    /**
+     * Send button color can be set in hex format.
+     * If it's not provided, color from Infobip Portal widget configuration will be set.
+     */
+    sendButtonColor: PropTypes.string,
+};
+
+export const RNMMChatView = requireNativeComponent('RNMMChatView', ChatView);

package/{index.js → src/index.js}

@@ -1,19 +1,13 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types';
-import {
+import {    
+    EmitterSubscription,
     NativeEventEmitter,
     NativeModules,
+    Permission,
     PermissionsAndroid,
-    Platform,
-    requireNativeComponent,
-    Text,
-    View,
-    findNodeHandle,
-    UIManager,
-    EmitterSubscription,
+    Platform,    
 } from 'react-native';
-import type {Rationale} from "react-native/Libraries/PermissionsAndroid/PermissionsAndroid";
-import {Permission} from "react-native";
+import type {Rationale} from 'react-native/Libraries/PermissionsAndroid/PermissionsAndroid';
+
 
 const { ReactNativeMobileMessaging, RNMMChat } = NativeModules;
 
@@ -248,7 +242,7 @@ class MobileMessaging {
             });
         }
 
-        config.reactNativePluginVersion = require('./package').version;
+        config.reactNativePluginVersion = require('../package').version;
 
         ReactNativeMobileMessaging.init(config, onSuccess, onError);
     };
@@ -437,21 +431,21 @@ class MobileMessaging {
         }
 
         return {
-            find: function (messageId, onSuccess, onError = function() {} ) {
+            find (messageId, onSuccess, onError = function() {}) {
                 ReactNativeMobileMessaging.defaultMessageStorage_find(messageId, onSuccess, onError);
             },
 
-            findAll: function (onSuccess, onError = function() {}) {
+            findAll (onSuccess, onError = function() {}) {
                 ReactNativeMobileMessaging.defaultMessageStorage_findAll(onSuccess, onError);
             },
 
-            delete: function (messageId, onSuccess = function() {}, onError = function() {}) {
+            delete (messageId, onSuccess = function() {}, onError = function() {}) {
                 ReactNativeMobileMessaging.defaultMessageStorage_delete(messageId, onSuccess, onError);
             },
 
-            deleteAll: function (onSuccess = function() {}, onError = function() {}) {
+            deleteAll (onSuccess = function() {}, onError = function() {}) {
                 ReactNativeMobileMessaging.defaultMessageStorage_deleteAll(onSuccess, onError);
-            }
+            },
         };
     };
 
@@ -459,7 +453,7 @@ class MobileMessaging {
      * Displays built-in error dialog so that user can resolve errors during SDK initialization.
      *
      * @name showDialogForError
-     * @param {Int} errorCode to display dialog for
+     * @param {Number} errorCode to display dialog for
      * @param {Function} onSuccess will be called upon completion
      * @param {Function} onError will be called on error
      */
@@ -653,67 +647,6 @@ class MobileMessaging {
 
 }
 
-export class ChatView extends React.Component {
-    androidViewId;
-
-    componentDidMount() {
-        if (Platform.OS === "ios") {
-            this.add();
-        } else {
-            //fix for android, sometimes it can't get parent view, which is needed for properly relayout
-            let _this = this;
-            setTimeout(function() { _this.add(); }, 100);
-        }
-    }
-
-    componentWillUnmount() {
-        this.remove();
-    }
-
-    add = () => {
-        //not needed for iOS
-        if (Platform.OS === "ios") {
-            return;
-        }
-        this.androidViewId = findNodeHandle(this.refs.rnmmChatViewRef);
-        console.log('Native android viewId: ', this.androidViewId);
-
-        UIManager.dispatchViewManagerCommand(
-            this.androidViewId,
-            UIManager.RNMMChatView.Commands.add.toString(),
-            [this.androidViewId],
-        );
-    };
-
-    remove = () => {
-        //not needed for iOS
-        if (Platform.OS === "ios") {
-            return;
-        }
-        UIManager.dispatchViewManagerCommand(
-            this.androidViewId,
-            UIManager.RNMMChatView.Commands.remove.toString(),
-            [this.androidViewId],
-        );
-    };
-
-    render() {
-        return (
-            <RNMMChatView {...this.props}
-                          ref="rnmmChatViewRef"
-            />
-        );
-    }
-}
-
-ChatView.propTypes = {
-    /**
-     * Send button color can be set in hex format.
-     * If it's not provided, color from Infobip Portal widget configuration will be set.
-     */
-    sendButtonColor: PropTypes.string,
-}
-
-export let RNMMChatView = requireNativeComponent('RNMMChatView', ChatView);
+export {ChatView, RNMMChatView} from './components/RNMMChatViewNativeComponent';
 
-export let mobileMessaging = new MobileMessaging();
+export const mobileMessaging = new MobileMessaging();