From 66e5a8506f6c0deded8ea4b7729e9a41b29bc921 Mon Sep 17 00:00:00 2001 From: Libin Lu Date: Sun, 4 Dec 2016 17:24:57 -0500 Subject: [PATCH] fix an android warning --- .../java/com/evollu/react/fcm/FIRLocalMessagingHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java index 8361185..6cd3549 100644 --- a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java +++ b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java @@ -109,11 +109,11 @@ public class FIRLocalMessagingHelper { //large icon String largeIcon = bundle.getString("large-icon"); - if(largeIcon != null){ + if(largeIcon != null && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP){ int largeIconResId = res.getIdentifier(largeIcon, "mipmap", packageName); Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId); - if (largeIconResId != 0 && (largeIcon != null || android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP)) { + if (largeIconResId != 0) { notification.setLargeIcon(largeIconBitmap); } } @@ -125,7 +125,7 @@ public class FIRLocalMessagingHelper { } //sound - if (bundle.containsKey("sound")) { + if (bundle.getString("sound") != null) { int soundResourceId = res.getIdentifier(bundle.getString("sound"), "raw", packageName); notification.setSound(Uri.parse("android.resource://" + packageName + "/" + soundResourceId)); } -- 2.26.2