Merge pull request #1355 from jackw-kounta/master

Use FirebaseInstanceId for deviceToken, not from Intent

Author: Dallas62

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java

@@ -8,6 +8,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.dieam.reactnativepushnotification.helpers.ApplicationBadgeHelper;
@@ -28,6 +30,10 @@
 
 import android.util.Log;
 
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.InstanceIdResult;
 import com.google.firebase.messaging.FirebaseMessaging;
 
 public class RNPushNotification extends ReactContextBaseJavaModule implements ActivityEventListener {
@@ -84,15 +90,24 @@ public void onNewIntent(Intent intent) {
 
     private void registerNotificationsRegistration() {
         IntentFilter intentFilter = new IntentFilter(getReactApplicationContext().getPackageName() + ".RNPushNotificationRegisteredToken");
+        final RNPushNotificationJsDelivery fMjsDelivery = mJsDelivery;
 
         getReactApplicationContext().registerReceiver(new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                String token = intent.getStringExtra("token");
-                WritableMap params = Arguments.createMap();
-                params.putString("deviceToken", token);
-
-                mJsDelivery.sendEvent("remoteNotificationsRegistered", params);
+                FirebaseInstanceId.getInstance().getInstanceId()
+                        .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
+                            @Override
+                            public void onComplete(@NonNull Task<InstanceIdResult> task) {
+                                if (!task.isSuccessful()) {
+                                    return;
+                                }
+
+                                WritableMap params = Arguments.createMap();
+                                params.putString("deviceToken", task.getResult().getToken());
+                                fMjsDelivery.sendEvent("remoteNotificationsRegistered", params);
+                            }
+                        });
             }
         }, intentFilter);
     }