Skip to content

Commit e214fd9

Browse files
stop using deprecated firebase iid (#751)
In order to solve #741 it seems we need to stop using firebase iid that is [deprecated](https://firebase.google.com/docs/reference/android/com/google/firebase/iid/package-summary). As part of it, I bumped the firebase-messaging version to 21.1.0 Co-authored-by: Yogev Ben David <[email protected]>
1 parent 9a670a6 commit e214fd9

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

lib/android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def DEFAULT_COMPILE_SDK_VERSION = 29
1212
def DEFAULT_MIN_SDK_VERSION = 21
1313
def DEFAULT_KOTLIN_VERSION = "1.3.61"
1414
def DEFAULT_KOTLIN_STDLIB_VERSION = "kotlin-stdlib-jdk8"
15-
def DEFAULT_FIREBASE_MESSAGING_VERSION = "20.2.0"
15+
def DEFAULT_FIREBASE_MESSAGING_VERSION = "21.1.0"
1616

1717
def androidSdkVersion = safeExtGet('androidSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
1818
def androidMinSdkVersion = safeExtGet('androidMinSdkVersion', DEFAULT_MIN_SDK_VERSION)

lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
import com.facebook.react.ReactApplication;
88
import com.facebook.react.ReactInstanceManager;
99
import com.facebook.react.bridge.ReactContext;
10-
import com.facebook.react.modules.core.DeviceEventManagerModule;
11-
import com.google.android.gms.tasks.OnSuccessListener;
12-
import com.google.firebase.iid.FirebaseInstanceId;
13-
import com.google.firebase.iid.InstanceIdResult;
10+
import com.google.firebase.messaging.FirebaseMessaging;
1411
import com.wix.reactnativenotifications.BuildConfig;
1512
import com.wix.reactnativenotifications.core.JsIOHelper;
1613

@@ -75,17 +72,19 @@ public void onAppReady() {
7572
}
7673

7774
protected void refreshToken() {
78-
FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
79-
@Override
80-
public void onSuccess(InstanceIdResult instanceIdResult) {
81-
sToken = instanceIdResult.getToken();
75+
FirebaseMessaging.getInstance().getToken()
76+
.addOnCompleteListener(task -> {
77+
if (!task.isSuccessful()) {
78+
if (BuildConfig.DEBUG) Log.w(LOGTAG, "Fetching FCM registration token failed", task.getException());
79+
return;
80+
}
81+
sToken = task.getResult();
8282
if (mAppContext instanceof IFcmTokenListenerApplication) {
8383
((IFcmTokenListenerApplication) mAppContext).onNewFCMToken(sToken);
8484
}
8585
if (BuildConfig.DEBUG) Log.i(LOGTAG, "FCM has a new token" + "=" + sToken);
8686
sendTokenToJS();
87-
}
88-
});
87+
});
8988
}
9089

9190
protected void sendTokenToJS() {

0 commit comments

Comments
 (0)