From d9d1b9858178a8b0d7974cbb076c32005856afd4 Mon Sep 17 00:00:00 2001 From: Alexey Bratushka Date: Fri, 10 May 2019 13:30:25 +0300 Subject: [PATCH 1/2] Fixes issue-1111 for react-native-fcm --- .../main/java/com/evollu/react/fcm/InstanceIdService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java b/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java index f01c160c..bca49229 100644 --- a/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java +++ b/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java @@ -11,9 +11,9 @@ import com.facebook.react.ReactInstanceManager; import com.facebook.react.bridge.ReactContext; import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.iid.FirebaseInstanceIdService; +import com.google.firebase.messaging.FirebaseMessagingService; -public class InstanceIdService extends FirebaseInstanceIdService { +public class InstanceIdService extends FirebaseMessagingService { private static final String TAG = "InstanceIdService"; @@ -24,7 +24,7 @@ public class InstanceIdService extends FirebaseInstanceIdService { */ // [START refresh_token] @Override - public void onTokenRefresh() { + public void onNewToken(String token) { // Get updated InstanceID token. String refreshedToken = FirebaseInstanceId.getInstance().getToken(); Log.d(TAG, "Refreshed token: " + refreshedToken); From c7dbd4d94664744ea452a2b0c13fe68a64fe158e Mon Sep 17 00:00:00 2001 From: Alexey Bratushka Date: Wed, 18 Sep 2019 16:25:14 +0300 Subject: [PATCH 2/2] Default value for natification icon changed to match miipmap file, as AndroidManifest value is not passed and default is applied. --- .../main/java/com/evollu/react/fcm/SendNotificationTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java b/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java index e04ec12a..47a84691 100644 --- a/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java +++ b/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java @@ -136,7 +136,7 @@ protected Void doInBackground(Void... params) { } //icon - String smallIcon = bundle.getString("icon", "ic_launcher"); + String smallIcon = bundle.getString("icon", "ic_notif"); int smallIconResId = res.getIdentifier(smallIcon, "mipmap", packageName); if(smallIconResId == 0){ smallIconResId = res.getIdentifier(smallIcon, "drawable", packageName);