From 6d5868f1f091e00bcdca7aacbc342e6209e91a1c Mon Sep 17 00:00:00 2001
From: Daniel Eliraz <danielel@wix.com>
Date: Wed, 23 Jun 2021 14:41:48 +0300
Subject: [PATCH] stop using deprecated firebase iid

---
 lib/android/app/build.gradle                  |  2 +-
 .../fcm/FcmToken.java                         | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/android/app/build.gradle b/lib/android/app/build.gradle
index dacd22fff..47cc39c41 100644
--- a/lib/android/app/build.gradle
+++ b/lib/android/app/build.gradle
@@ -12,7 +12,7 @@ def DEFAULT_COMPILE_SDK_VERSION = 29
 def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_KOTLIN_VERSION = "1.3.61"
 def DEFAULT_KOTLIN_STDLIB_VERSION = "kotlin-stdlib-jdk8"
-def DEFAULT_FIREBASE_MESSAGING_VERSION = "20.2.0"
+def DEFAULT_FIREBASE_MESSAGING_VERSION = "21.1.0"
 
 def androidSdkVersion = safeExtGet('androidSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
 def androidMinSdkVersion = safeExtGet('androidMinSdkVersion', DEFAULT_MIN_SDK_VERSION)
diff --git a/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
index 09bcce75d..7db6e8d88 100644
--- a/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
+++ b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
@@ -7,10 +7,7 @@
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.wix.reactnativenotifications.BuildConfig;
 import com.wix.reactnativenotifications.core.JsIOHelper;
 
@@ -75,17 +72,19 @@ public void onAppReady() {
     }
 
     protected void refreshToken() {
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
-            @Override
-            public void onSuccess(InstanceIdResult instanceIdResult) {
-                sToken = instanceIdResult.getToken();
+        FirebaseMessaging.getInstance().getToken()
+            .addOnCompleteListener(task -> {
+                if (!task.isSuccessful()) {
+                    if (BuildConfig.DEBUG) Log.w(LOGTAG, "Fetching FCM registration token failed", task.getException());
+                    return;
+                }
+                sToken = task.getResult();
                 if (mAppContext instanceof IFcmTokenListenerApplication) {
                     ((IFcmTokenListenerApplication) mAppContext).onNewFCMToken(sToken);
                 }
                 if (BuildConfig.DEBUG) Log.i(LOGTAG, "FCM has a new token" + "=" + sToken);
                 sendTokenToJS();
-            }
-        });
+            });
     }
 
     protected void sendTokenToJS() {