infobip-mobile-messaging-react-native-plugin 5.0.0 → 6.0.0

package/.ruby-version

@@ -0,0 +1 @@
+2.7.4

package/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'

package/Gemfile.lock

@@ -0,0 +1,96 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.3)
+      cocoapods-deintegrate (>= 1.0.5, < 2.0)
+      cocoapods-downloader (>= 1.6.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.5.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.1)
+    minitest (5.15.0)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.6)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.4)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  cocoapods (~> 1.11, >= 1.11.2)
+RUBY VERSION
+   ruby 2.7.4p191
+BUNDLED WITH
+   2.2.27

package/README.md

@@ -10,17 +10,18 @@ The document describes library integration steps for your React Native project.
 * [Initialization configuration](#initialization-configuration)
 
 ## Requirements
-- node (v10.17.0 or higher)
-- React Native (v0.66.3)
+- node (v16.10.0 or higher)
+- ruby (2.7.4)
+- React Native (v0.68.0)
 
 For iOS project:
-- Xcode and Command Line Tools (13.1)
-- CocoaPods (v1.10.1)
+- Xcode and Command Line Tools (13.2.1)
+- CocoaPods (v1.11.3)
 - Minimum deployment target 11.0
 
 For Android project:
-- Android Studio (v4.0)
-- Gradle (v4.2.0)
+- Android Studio (Bumblebee | 2021.1.1)
+- Gradle (v7.3.3)
 - Minimum API Level: 21 (Android 5.0 - [Lollipop](https://developer.android.com/about/versions/lollipop))
 
 ## Quick start guide
@@ -39,10 +40,10 @@ This guide is designed to get you up and running with Mobile Messaging SDK plugi
     - **iOS**
         1. Add `use_frameworks!` into `/ios/Podfile` (required for Swift frameworks such as our Mobile Messaging SDK)
         2. Run `pod install` from `/ios` folder (installs Mobile Messaging native SDK)
-        3. Import MobileMessaging `@import MobileMessaging;` and add `[MobileMessagingPluginApplicationDelegate install];` into `/ios/<ProjectName>/AppDelegate.m` (this is required for OS callbacks such as `didRegisterForRemoteNotifications` to be intercepted by native MobileMessaging SDK)
+        3. Import following header `#import <MobileMessaging/MobileMessagingPluginApplicationDelegate.h>` and add `[MobileMessagingPluginApplicationDelegate install];` into `/ios/<ProjectName>/AppDelegate.m` (this is required for OS callbacks such as `didRegisterForRemoteNotifications` to be intercepted by native MobileMessaging SDK)
         ```objective-c
             ...
-            @import MobileMessaging;
+            #import <MobileMessaging/MobileMessagingPluginApplicationDelegate.h>
       
             @implementation AppDelegate
 
@@ -66,13 +67,21 @@ This guide is designed to get you up and running with Mobile Messaging SDK plugi
         export PATH=$PATH:$ANDROID_HOME/tools/bin
         export PATH=$PATH:$ANDROID_HOME/platform-tools
         ```
-        2. Add [Firebase Sender Id](https://www.infobip.com/docs/mobile-app-messaging/fcm-server-api-key-setup-guide) to the `/android/app/src/main/res/values/strings.xml`
-        ```xml
-        <resources>
-            ...
-            <string name="google_app_id">your google app id</string>
-        </resources>
+        2. Add 'com.google.gms:google-services' to `android/build.gradle` file
+        ```groovy
+        buildscript {
+           ...
+           dependencies {
+               ...
+              //GMS Gradle plugin
+              classpath 'com.google.gms:google-services:4.3.10'
+           }
+        }
         ```
+        And add `apply plugin: 'com.google.gms.google-services'` at the end of your `android/app/build.gradle` in order to apply [Google Services Gradle Plugin](https://developers.google.com/android/guides/google-services-plugin)
+       3. Add a Firebase configuration file (google-services.json) as described in <a href="https://firebase.google.com/docs/android/setup#add-config-file" target="_blank">`Firebase documentation`</a>
+      > ### Notice:
+      > Check <a href="https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Applying-Firebase-configuration-in-MobileMessaging-SDK">Applying Firebase configuration in MobileMessaging SDK Guide</a> for alternatives.
 
 ## Initialization configuration
 

package/android/build.gradle

@@ -1,30 +1,19 @@
-def defaultCompileSDKVersion = 30
-def defaultBuildToolsVersion = '30.0.2'
+def defaultCompileSDKVersion = 31
+def defaultBuildToolsVersion = '31.0.0'
 def defaultMinSDKVersion = 21
-def defaultTargetSDKVersion = 30
+def defaultTargetSDKVersion = 31
 
 def getRootProjectProperty(property, fallback) {
     rootProject.ext.has(property) ? rootProject.ext.get(property) : fallback
 }
 
-def overrideAndroidSupportLibsVersion = getRootProjectProperty('overrideAndroidSupportLibsVersion', '')
 def overrideGmsVersion = getRootProjectProperty('overrideGmsVersion', '')
 def overrideFirebaseVersion = getRootProjectProperty('overrideFirebaseVersion', '')
 def overrideKotlinVersion = getRootProjectProperty('overrideKotlinVersion', '')
-
-if (overrideAndroidSupportLibsVersion.empty || overrideAndroidSupportLibsVersion > "26") {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
-    }
-}
+def withCryptorMigration = getRootProjectProperty('withCryptorMigration', false)
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -34,8 +23,14 @@ buildscript {
     if (project == rootProject) {
         repositories {
             google()
-            jcenter()
-            mavenCentral()
+            mavenLocal()
+            mavenCentral {
+                // We don't want to fetch react-native from Maven Central as there are
+                // older versions over there.
+                content {
+                    excludeGroup "com.facebook.react"
+                }
+            }
         }
         dependencies {
             classpath 'com.android.tools.build:gradle:4.2+'
@@ -44,7 +39,7 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion getRootProjectProperty('compileSdkVersion', defaultCompileSDKVersion)
@@ -63,8 +58,6 @@ android {
 
 repositories {
     // ref: https://www.baeldung.com/maven-local-repository
-    mavenLocal()
-    mavenCentral()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
         url "$rootDir/../node_modules/react-native/android"
@@ -73,17 +66,25 @@ repositories {
         // Android JSC is installed from npm
         url "$rootDir/../node_modules/jsc-android/dist"
     }
+    mavenCentral {
+        // We don't want to fetch react-native from Maven Central as there are
+        // older versions over there.
+        content {
+            excludeGroup "com.facebook.react"
+        }
+    }
     google()
-    jcenter()
+    mavenLocal()
 }
 
 dependencies {
-    def mmVersion = '5.3.6'
+    def mmVersion = '6.2.1'
 
     implementation 'com.facebook.react:react-native:+'
     implementation "androidx.annotation:annotation:1.1.0"
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.1.0'
+
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
 
     implementation "com.infobip:infobip-mobile-messaging-android-resources:$mmVersion@aar"
     implementation "com.infobip:infobip-mobile-messaging-android-chat-sdk:$mmVersion@aar"
@@ -95,10 +96,6 @@ dependencies {
             exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
         }
 
-        if (!overrideAndroidSupportLibsVersion.empty) {
-            exclude group: 'com.android.support', module: 'support-v4'
-            exclude group: 'com.android.support', module: 'appcompat-v7'
-        }
         if (!overrideGmsVersion.empty) {
             exclude group: 'com.google.android.gms', module: 'play-services-location'
         }
@@ -106,14 +103,14 @@ dependencies {
             exclude group: 'com.google.firebase', module: 'firebase-messaging'
         }
     }
-    if (!overrideAndroidSupportLibsVersion.empty) {
-        implementation "com.android.support:support-v4:$overrideAndroidSupportLibsVersion"
-        implementation "com.android.support:appcompat-v7:$overrideAndroidSupportLibsVersion"
-    }
     if (!overrideGmsVersion.empty) {
         implementation "com.google.android.gms:play-services-location:$overrideGmsVersion"
     }
     if (!overrideFirebaseVersion.empty) {
         implementation "com.google.firebase:firebase-messaging:$overrideFirebaseVersion"
     }
-}
+
+    if (withCryptorMigration.toBoolean()) {
+        implementation "com.infobip:infobip-mobile-messaging-android-cryptor-migration:$mmVersion@aar"
+    }
+}

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

package/android/src/main/AndroidManifest.xml

@@ -39,8 +39,6 @@
                 android:exported="false"
                 android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <receiver android:name="org.infobip.mobile.messaging.notification.NotificationTapReceiver" />
-
         <receiver
                 android:name="org.infobip.mobile.messaging.MobileMessagingConnectivityReceiver"
                 android:enabled="false"
@@ -50,8 +48,11 @@
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
-        <receiver android:name="org.infobip.mobile.messaging.interactive.notification.NotificationActionTapReceiver" />
-        <receiver android:name="org.infobip.reactlibrary.mobilemessaging.ReactNativeMobileMessagingModule$MessageEventReceiver" android:exported="false">
+        <receiver android:name="org.infobip.mobile.messaging.interactive.notification.NotificationActionTapReceiver"
+            android:exported="false"/>
+
+        <receiver android:name="org.infobip.reactlibrary.mobilemessaging.ReactNativeMobileMessagingModule$MessageEventReceiver"
+                  android:exported="false">
             <intent-filter>
                 <action android:name="org.infobip.mobile.messaging.MESSAGE_RECEIVED" />
                 <action android:name="org.infobip.mobile.messaging.NOTIFICATION_TAPPED" />

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

@@ -10,12 +10,15 @@ import java.util.Map;
 
 import androidx.annotation.NonNull;
 
+import com.google.firebase.FirebaseOptions;
+
 class Configuration {
 
     class AndroidConfiguration {
         String notificationIcon;
         boolean multipleNotifications;
         String notificationAccentColor;
+        FirebaseOptions firebaseOptions;
     }
 
     class PrivacySettings {
@@ -62,4 +65,4 @@ class Configuration {
 
         return config;
     }
-}
+}

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

@@ -31,6 +31,8 @@ import org.infobip.mobile.messaging.mobileapi.MobileMessagingError;
 import org.infobip.mobile.messaging.mobileapi.Result;
 import org.infobip.mobile.messaging.storage.MessageStore;
 import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
+import org.infobip.mobile.messaging.util.Cryptor;
+import org.infobip.mobile.messaging.util.DeviceInformation;
 import org.infobip.mobile.messaging.util.PreferenceHelper;
 import org.infobip.reactlibrary.mobilemessaging.datamappers.*;
 import org.infobip.mobile.messaging.dal.bundle.MessageBundleMapper;
@@ -333,6 +335,24 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
                 notificationBuilder.withColor(color);
             }
             builder.withDisplayNotification(notificationBuilder.build());
+
+            if (configuration.android.firebaseOptions != null) {
+                builder.withFirebaseOptions(configuration.android.firebaseOptions);
+            }
+        }
+
+        // Checking do we need to migrate data saved with old cryptor,
+        // if withCryptorMigration project ext property is set, ECBCryptorImpl class will exist.
+        Cryptor cryptor = null;
+        try {
+            Class cls = Class.forName("org.infobip.mobile.messaging.cryptor.ECBCryptorImpl");
+            cryptor = (Cryptor) cls.getDeclaredConstructor(String.class).newInstance(DeviceInformation.getDeviceID(context));
+        } catch (Exception e) {
+            Log.d(Utils.TAG, "Will not migrate cryptor :");
+            e.printStackTrace();
+        }
+        if (cryptor != null) {
+            builder.withCryptorMigration(cryptor);
         }
 
         builder.build(new MobileMessaging.InitListener() {
@@ -382,16 +402,14 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             messageStorageIntentFilter.addAction(action);
         }
 
-        Context context = reactContext.getCurrentActivity();
-        LocalBroadcastManager.getInstance(context).registerReceiver(messageStorageReceiver, messageStorageIntentFilter);
+        LocalBroadcastManager.getInstance(reactContext).registerReceiver(messageStorageReceiver, messageStorageIntentFilter);
         broadcastReceiverRegistered = true;
     }
 
     private void unregisterBroadcastReceiver() {
         if (!broadcastReceiverRegistered) return;
         reactContext.unregisterReceiver(commonLibraryBroadcastReceiver);
-        Context context = reactContext.getCurrentActivity();
-        LocalBroadcastManager.getInstance(context).unregisterReceiver(messageStorageReceiver);
+        LocalBroadcastManager.getInstance(reactContext).unregisterReceiver(messageStorageReceiver);
         broadcastReceiverRegistered = false;
     }
 
@@ -443,14 +461,13 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
 
     @ReactMethod
     public synchronized void defaultMessageStorage_find(String messageId, final Callback onSuccess, final Callback onError) throws JSONException {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             onError.invoke(Utils.callbackError("Message store does not exist", null));
             return;
         }
 
-        for (Message m : messageStore.findAll(context)) {
+        for (Message m : messageStore.findAll(reactContext)) {
             if (messageId.equals(m.getMessageId())) {
                 onSuccess.invoke(ReactNativeJson.convertJsonToMap(MessageJson.toJSON(m)));
                 return;
@@ -461,46 +478,43 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
 
     @ReactMethod
     public void defaultMessageStorage_findAll(final Callback onSuccess, final Callback onError) throws JSONException {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             onError.invoke(Utils.callbackError("Message store does not exist", null));
             return;
         }
-        List<Message> messages = messageStore.findAll(context);
+        List<Message> messages = messageStore.findAll(reactContext);
         onSuccess.invoke(ReactNativeJson.convertJsonToArray(MessageJson.toJSONArray(messages.toArray(new Message[messages.size()]))));
     }
 
     @ReactMethod
     public synchronized void defaultMessageStorage_delete(String messageId, final Callback onSuccess, final Callback onError) throws JSONException {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             onError.invoke(Utils.callbackError("Message store does not exist", null));
             return;
         }
 
         List<Message> messagesToKeep = new ArrayList<Message>();
-        for (Message m : messageStore.findAll(context)) {
+        for (Message m : messageStore.findAll(reactContext)) {
             if (messageId.equals(m.getMessageId())) {
                 continue;
             }
             messagesToKeep.add(m);
         }
-        messageStore.deleteAll(context);
-        messageStore.save(context, messagesToKeep.toArray(new Message[messagesToKeep.size()]));
+        messageStore.deleteAll(reactContext);
+        messageStore.save(reactContext, messagesToKeep.toArray(new Message[messagesToKeep.size()]));
         onSuccess.invoke();
     }
 
     @ReactMethod
     public synchronized void defaultMessageStorage_deleteAll(final Callback onSuccess, final Callback onError) {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             onError.invoke(Utils.callbackError("Message store does not exist", null));
             return;
         }
-        messageStore.deleteAll(context);
+        messageStore.deleteAll(reactContext);
         onSuccess.invoke();
     }
 
@@ -681,14 +695,13 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
 
     @ReactMethod
     public synchronized void defaultMessageStorage_find(String messageId, final Callback callback) throws JSONException {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             callback.invoke();
             return;
         }
 
-        for (Message m : messageStore.findAll(context)) {
+        for (Message m : messageStore.findAll(reactContext)) {
             if (messageId.equals(m.getMessageId())) {
                 callback.invoke(ReactNativeJson.convertJsonToMap(MessageJson.toJSON(m)));
                 return;
@@ -699,46 +712,43 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
 
     @ReactMethod
     public synchronized void defaultMessageStorage_findAll(final Callback callback) throws JSONException {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             callback.invoke();
             return;
         }
-        List<Message> messages = messageStore.findAll(context);
+        List<Message> messages = messageStore.findAll(reactContext);
         callback.invoke(ReactNativeJson.convertJsonToArray(MessageJson.toJSONArray(messages.toArray(new Message[messages.size()]))));
     }
 
     @ReactMethod
     public synchronized void defaultMessageStorage_delete(String messageId, final Callback callback) throws JSONException {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             callback.invoke();
             return;
         }
 
         List<Message> messagesToKeep = new ArrayList<Message>();
-        for (Message m : messageStore.findAll(context)) {
+        for (Message m : messageStore.findAll(reactContext)) {
             if (messageId.equals(m.getMessageId())) {
                 continue;
             }
             messagesToKeep.add(m);
         }
-        messageStore.deleteAll(context);
-        messageStore.save(context, messagesToKeep.toArray(new Message[messagesToKeep.size()]));
+        messageStore.deleteAll(reactContext);
+        messageStore.save(reactContext, messagesToKeep.toArray(new Message[messagesToKeep.size()]));
         callback.invoke();
     }
 
     @ReactMethod
     public synchronized void defaultMessageStorage_deleteAll(final Callback callback) {
-        Context context = reactContext.getCurrentActivity();
-        MessageStore messageStore = MobileMessaging.getInstance(context).getMessageStore();
+        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
         if (messageStore == null) {
             callback.invoke();
             return;
         }
-        messageStore.deleteAll(context);
+        messageStore.deleteAll(reactContext);
         callback.invoke();
     }
 
@@ -807,8 +817,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     @ReactMethod
     void messageStorage_provideFindAllResult(ReadableArray result) {
 
-        Context context = getReactApplicationContext().getCurrentActivity();
-        MessageStoreAdapter.init(context);
+        MessageStoreAdapter.init(getReactApplicationContext());
 
         try {
             MessageStoreAdapter.messageStorage_findAllResults.addIfAbsent(ReactNativeJson.convertArrayToJson(result));
@@ -844,7 +853,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         reactContext.removeActivityEventListener(this);
 
         GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
-        int playServicesAvailabilityResult = googleApiAvailability.isGooglePlayServicesAvailable(getCurrentActivity());
+        int playServicesAvailabilityResult = googleApiAvailability.isGooglePlayServicesAvailable(reactContext);
         if (playServicesAvailabilityResult != ConnectionResult.SUCCESS) {
             try {
                 showDialogForError(playServicesAvailabilityResult, successCallback, errorCallback);

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

@@ -1,7 +1,5 @@
 package org.infobip.reactlibrary.mobilemessaging;
 
-import android.widget.FrameLayout;
-
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
@@ -13,7 +11,6 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
 
 public class ReactNativeMobileMessagingPackage implements ReactPackage {
 

package/index.js

@@ -12,6 +12,8 @@ import {
     UIManager,
     EmitterSubscription,
 } from 'react-native';
+import type {Rationale} from "react-native/Libraries/PermissionsAndroid/PermissionsAndroid";
+import {Permission} from "react-native";
 
 const { ReactNativeMobileMessaging, RNMMChat } = NativeModules;
 
@@ -146,8 +148,14 @@ class MobileMessaging {
      *		ios: {
      *			notificationTypes: ['alert', 'sound', 'badge'],
      *			forceCleanup: <Boolean>,
-     *          logging: <Boolean>
+     *			logging: <Boolean>
      *		},
+     *	    android: {
+     *			notificationIcon: <String>,
+     *			multipleNotifications: <Boolean>,
+     *			notificationAccentColor: <String>
+     *			firebaseOptions: <Object>
+     *	    }
      *		privacySettings: {
      *			applicationCodePersistingDisabled: <Boolean>,
      *			userDataPersistingDisabled: <Boolean>,
@@ -242,33 +250,7 @@ class MobileMessaging {
 
         config.reactNativePluginVersion = require('./package').version;
 
-        let geofencingEnabled = config.geofencingEnabled;
-        if (geofencingEnabled && Platform.OS === 'android') {
-            this.checkAndroidLocationPermission().then(granted => {
-                if (!granted) {
-                    onError('Geofencing permission is not granted.');
-                    return;
-                }
-                ReactNativeMobileMessaging.init(config, onSuccess, onError);
-            })
-        } else {
-            ReactNativeMobileMessaging.init(config, onSuccess, onError);
-        }
-    };
-
-    async checkAndroidLocationPermission(): Promise<Boolean> {
-        const locationPermissionGranted = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION);
-        if (locationPermissionGranted) {
-            return true;
-        } else {
-            try {
-                const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION);
-                return granted === PermissionsAndroid.RESULTS.GRANTED;
-            } catch (err) {
-                console.error('[RNMobileMessaging] Can\'t check android permission', err);
-                return false;
-            }
-        }
+        ReactNativeMobileMessaging.init(config, onSuccess, onError);
     };
 
     /**
@@ -580,6 +562,64 @@ class MobileMessaging {
     resetMessageCounter() {
         RNMMChat.resetMessageCounter();
     }
+
+    /* 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 requestAndroidPermissions(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.requestAndroidPermissions(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);
+    };
+
 }
 
 export class ChatView extends React.Component {

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", "9.2.11"
-  s.dependency "MobileMessaging/Geofencing", "9.2.11"
-  s.dependency "MobileMessaging/InAppChat", "9.2.11"
+  s.dependency "MobileMessaging/Core", "9.2.16"
+  s.dependency "MobileMessaging/Geofencing", "9.2.16"
+  s.dependency "MobileMessaging/InAppChat", "9.2.16"
 
 end

package/ios/Cartfile

@@ -1 +1 @@
-github "infobip/mobile-messaging-sdk-ios" "9.2.11"
+github "infobip/mobile-messaging-sdk-ios" "9.2.16"

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "infobip/mobile-messaging-sdk-ios" "9.2.11"
+github "infobip/mobile-messaging-sdk-ios" "9.2.16"

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -70,18 +70,22 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
             return
         }
 
+        let successCallback: RCTResponseSenderBlock = { [weak self] response in
+            RNMobileMessagingConfiguration.saveConfigToDefaults(rawConfig: config)
+            self?.isStarted = true
+            onSuccess(response)
+        }
+
         let cachedConfigDict = RNMobileMessagingConfiguration.getRawConfigFromDefaults()
         if let cachedConfigDict = cachedConfigDict, (config as NSDictionary) != (cachedConfigDict as NSDictionary)
         {
             stop()
-            start(configuration: configuration, onSuccess: onSuccess)
+            start(configuration: configuration, onSuccess: successCallback)
         } else if cachedConfigDict == nil {
-            start(configuration: configuration, onSuccess: onSuccess)
+            start(configuration: configuration, onSuccess: successCallback)
+        } else {
+            successCallback(nil)
         }
-
-        RNMobileMessagingConfiguration.saveConfigToDefaults(rawConfig: config)
-        isStarted = true
-        onSuccess(nil)
     }
 
     private func performEarlyStartIfPossible() {

package/ios/ReactNativeMobileMessaging.xcodeproj/project.pbxproj

@@ -146,7 +146,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0920;
-				ORGANIZATIONNAME = Facebook;
+				ORGANIZATIONNAME = Infobip;
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
 						CreatedOnToolsVersion = 6.1.1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "index.js",
   "scripts": {
@@ -34,11 +34,11 @@
   },
   "peerDependencies": {
     "react": "^17.0.2",
-    "react-native": ">=0.66.3 <1.0.x"
+    "react-native": ">=0.68.0 <1.0.x"
   },
   "devDependencies": {
-    "metro-react-native-babel-preset": "^0.66.2",
+    "metro-react-native-babel-preset": "^0.67.0",
     "react": "^17.0.2",
-    "react-native": "^0.66.3"
+    "react-native": "^0.68.0"
   }
 }

package/.gitattributes

@@ -1 +0,0 @@
-*.pbxproj -text