diff --git a/src/main/java/im/rosetta/service/dispatch/FirebaseDispatcher.java b/src/main/java/im/rosetta/service/dispatch/FirebaseDispatcher.java index b08fe04..4bd5ee9 100644 --- a/src/main/java/im/rosetta/service/dispatch/FirebaseDispatcher.java +++ b/src/main/java/im/rosetta/service/dispatch/FirebaseDispatcher.java @@ -85,11 +85,11 @@ public class FirebaseDispatcher { FirebaseMessaging.getInstance().send(message); } catch (Exception e) { - // Логирование ошибки + e.printStackTrace(); } } } catch (Exception e) { - // Логирование ошибки + e.printStackTrace(); } }); } @@ -146,12 +146,23 @@ public class FirebaseDispatcher { .setTitle(title) .setBody(messageText) .build()) + .setApnsConfig(ApnsConfig.builder() + .setAps(Aps.builder() + .setMutableContent(true) + .setSound("default") + .setAlert(ApsAlert.builder() + .setTitle(title) + .setBody(messageText) + .build()) + .build()) + .build()) + .putData("sender_public_key", senderPublicKey != null ? senderPublicKey : "") .setToken(token) .build(); FirebaseMessaging.getInstance().send(message); } catch (Exception e) { - // Логирование ошибки + e.printStackTrace(); } } } catch (Exception e) { diff --git a/src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java b/src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java index 8ab4efc..09b3b9b 100644 --- a/src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java +++ b/src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java @@ -164,7 +164,7 @@ public class MessageDispatcher { /** * Отправляем PUSH уведомление получателю */ - this.firebaseDispatcher.sendPushNotification(toPublicKey, user.getTitle(), "New message"); + this.firebaseDispatcher.sendPushNotification(toPublicKey, user.getTitle(), "New message", fromPublicKey); } /**