From 077af3a46d4570cdd80cce49e06feb1ba506d363 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 21 Aug 2023 03:16:23 +0900 Subject: [PATCH] =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20-=20t?= =?UTF-8?q?oken=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0?= =?UTF-8?q?=EC=97=90=EB=A7=8C=20=EB=B0=9C=EC=86=A1=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/fcm/FcmService.kt | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt index 99075b6..1383185 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt @@ -21,38 +21,40 @@ class FcmService { messageId: Long? = null, contentId: Long? = null ) { - val multicastMessage = MulticastMessage.builder() - .addAllTokens(tokens) + if (tokens.isNotEmpty()) { + logger.info("os: $container") + val multicastMessage = MulticastMessage.builder() + .addAllTokens(tokens) - if (container == "ios") { - multicastMessage - .setNotification( - Notification.builder() - .setTitle(title) - .setBody(message) - .build() - ) - } else { - multicastMessage - .putData("title", title) - .putData("message", message) + if (container == "ios") { + multicastMessage + .setNotification( + Notification.builder() + .setTitle(title) + .setBody(message) + .build() + ) + } else { + multicastMessage + .putData("title", title) + .putData("message", message) + } + + if (roomId != null) { + multicastMessage.putData("room_id", roomId.toString()) + } + + if (messageId != null) { + multicastMessage.putData("message_id", messageId.toString()) + } + + if (contentId != null) { + multicastMessage.putData("content_id", contentId.toString()) + } + + val response = FirebaseMessaging.getInstance().sendEachForMulticast(multicastMessage.build()) + logger.info("보내기 성공: ${response.successCount}") + logger.info("보내기 실패: ${response.failureCount}") } - - if (roomId != null) { - multicastMessage.putData("room_id", roomId.toString()) - } - - if (messageId != null) { - multicastMessage.putData("message_id", messageId.toString()) - } - - if (contentId != null) { - multicastMessage.putData("content_id", contentId.toString()) - } - - val response = FirebaseMessaging.getInstance().sendEachForMulticast(multicastMessage.build()) - logger.info("os: $container") - logger.info("보내기 성공: ${response.successCount}") - logger.info("보내기 실패: ${response.failureCount}") } }