From 6d94a6e72d47ae46f21e6e7d61958993cc130133 Mon Sep 17 00:00:00 2001
From: RoyceDa <admin@rosetta-im.com>
Date: Fri, 20 Mar 2026 20:23:54 +0200
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20sender=5Fpublic=5Fkey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dispatch/FirebaseDispatcher.java    | 17 ++++++++++++++---
 .../service/dispatch/MessageDispatcher.java     |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

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);
     }    
 
     /**
-- 
2.49.1