Firebase messaging dependency updated to v22.0.0 (#68)

* Firebase messaging updated to v22.0.0
Replace deprecated method of with new methods of firebase messaging.

* Changelog updated

* Update CHANGELOG.md

Co-authored-by: ArtursKadikis <[email protected]>

Author: ijunaid

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 20.11.12
-* Bintray dependency removed
+* ! Minor breaking change ! Firebase dependency updated to version '22.0.0', replaced deprecated method to retrieve push token. This change now makes AndroidX mandatory.
+* Bintray respository inclusion removed.
 * Underlying android SDK is 20.11.11
 * Underlying iOS SDK version is 20.11.3
 

android/build.gradle

@@ -44,5 +44,5 @@ dependencies {
     implementation 'ly.count.android:sdk:20.11.11'
 
     //if any version higher than 18.0.0 is used then it forces AndroidX
-    implementation 'com.google.firebase:firebase-messaging:18.0.0'
+    implementation 'com.google.firebase:firebase-messaging:22.0.0'
 }

android/src/main/java/ly/count/android/sdk/react/CountlyMessagingService.java

@@ -42,11 +42,11 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
         // decode message data and extract meaningful information from it: title, body, badge, etc.
         CountlyPush.Message message = CountlyPush.decodeMessage(remoteMessage.getData());
 
-        if (message != null && message.has("typ")) {
-            // custom handling only for messages with specific "typ" keys
-            message.recordAction(getApplicationContext());
-            return;
-        }
+        // if (message != null && message.message().contains("typ")) {
+        //     // custom handling only for messages with specific "typ" keys
+        //     message.recordAction(getApplicationContext());
+        //     return;
+        // }
 
         Boolean result = CountlyPush.displayNotification(getApplicationContext(), message, getApplicationContext().getApplicationInfo().icon, null);
         if(Countly.sharedInstance().isLoggingEnabled()) {

android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -38,6 +38,8 @@
 import android.app.NotificationManager;
 import android.app.NotificationChannel;
 
+import androidx.annotation.NonNull;
+
 import ly.count.android.sdk.StarRatingCallback;
 import ly.count.android.sdk.messaging.CountlyPush;
 
@@ -50,11 +52,10 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.messaging.FirebaseMessaging;
 
 
 class CountlyReactException extends Exception {
@@ -548,25 +549,28 @@ public void askForNotificationPermission(ReadableArray args){
         CountlyPush.init(activity.getApplication(), messagingMode);
         try{
             FirebaseApp.initializeApp(context);
-            FirebaseInstanceId firebaseInstanceId = FirebaseInstanceId.getInstance();
-            if(firebaseInstanceId == null) {
-                log("askForNotificationPermission, firebaseInstanceId is null", LogLevel.WARNING);
+            FirebaseMessaging firebaseMessagingInstance = FirebaseMessaging.getInstance();
+            if(firebaseMessagingInstance == null) {
+                log("askForNotificationPermission, firebaseMessagingInstance is null", LogLevel.WARNING);
                 return;
             }
-            Task<InstanceIdResult> instanceIdResultTask = firebaseInstanceId.getInstanceId();
-            if(instanceIdResultTask == null) {
-                log("askForNotificationPermission, instanceIdResultTask is null", LogLevel.WARNING);
+            Task<String> firebaseMessagingTokenTask = firebaseMessagingInstance.getToken();
+            if(firebaseMessagingTokenTask == null) {
+                log("askForNotificationPermission, firebaseMessagingTokenTask is null", LogLevel.WARNING);
                 return;
             }
-            instanceIdResultTask.addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
+
+            firebaseMessagingTokenTask.addOnCompleteListener(new OnCompleteListener<String>() {
                 @Override
-                public void onComplete(Task<InstanceIdResult> task) {
-                    if (!task.isSuccessful()) {
-                        log("askForNotificationPermission, getInstanceId failed", task.getException(), LogLevel.WARNING);
-                        return;
-                    }
-                    String token = task.getResult().getToken();
-                    CountlyPush.onTokenRefresh(token);
+                public void onComplete(@NonNull Task<String> task) {
+                if (!task.isSuccessful()) {
+                    log("askForNotificationPermission, Fetching FCM registration token failed", task.getException(), LogLevel.WARNING);    
+                    return;
+                }
+
+                // Get new FCM registration token
+                String token = task.getResult();
+                CountlyPush.onTokenRefresh(token);
                 }
             });
         }catch(Exception exception){