Пуши

client-mobile/chats/data/remote/signalr/SignalRNotificationObserver.kt

@@ -0,0 +1,54 @@
+package chats.data.remote.signalr
+
+import android.content.Context
+import core.notifications.data.ActiveChatTracker
+import core.notifications.data.NotificationHelper
+import core.security.TokenManager
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SignalRNotificationObserver @Inject constructor(
+    private val signalrClient: ChatHubClient,
+    private val activeChatTracker: ActiveChatTracker,
+    private val tokenManager: TokenManager,
+    @ApplicationContext private val context: Context
+) {
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private var isStarted = false
+
+    fun start() {
+        if (isStarted) return
+        isStarted = true
+        
+        signalrClient.events
+            .filterIsInstance<ChatEvent.NewMessage>()
+            .onEach { event ->
+                val currentUserId = tokenManager.getUserId()
+                val message = event.message
+                
+                // Don't show if it's our message
+                if (message.senderId == currentUserId) return@onEach
+                
+                // Don't show if this chat is currently open
+                if (activeChatTracker.currentChatId.value == message.chatId) return@onEach
+                
+                NotificationHelper.showNotification(
+                    context = context,
+                    title = message.sender?.displayName ?: "Новое сообщение",
+                    body = message.content ?: "Вам прислали вложение",
+                    type = "chat",
+                    chatId = message.chatId,
+                    notificationId = message.id.hashCode()
+                )
+            }
+            .launchIn(scope)
+    }
+}

client-mobile/chats/presentation/chat_detail/ChatDetailViewModel.kt

@@ -50,6 +50,7 @@ class ChatDetailViewModel @Inject constructor(
     private val signalrClient: ChatHubClient,
     private val serverConfig: ServerConfig,
     private val tokenManager: TokenManager,
+    private val activeChatTracker: core.notifications.data.ActiveChatTracker,
     @dagger.hilt.android.qualifiers.ApplicationContext private val context: android.content.Context
 ) : ViewModel() {
 
@@ -88,6 +89,7 @@ class ChatDetailViewModel @Inject constructor(
     fun setChatId(chatId: String) {
         if (currentChatId == chatId) return
         currentChatId = chatId
+        activeChatTracker.setChatId(chatId)
         
         _state.update { it.copy(
             messages = emptyList(),
@@ -248,6 +250,7 @@ class ChatDetailViewModel @Inject constructor(
         signalrEventsJob?.cancel()
         signalrEventsJob = null
         currentChatId = null
+        activeChatTracker.setChatId(null)
         _state.update { it.copy(messages = emptyList(), isLoading = false) }
     }
 

client-mobile/chats/presentation/chat_list/ChatListViewModel.kt

@@ -24,6 +24,7 @@ data class ChatListState(
 @HiltViewModel
 class ChatListViewModel @Inject constructor(
     private val repository: ChatRepository,
+    private val authRepository: auth.domain.repository.AuthRepository,
     private val signalrClient: ChatHubClient,
     private val serverConfig: ServerConfig,
     private val tokenManager: TokenManager
@@ -33,6 +34,8 @@ class ChatListViewModel @Inject constructor(
     val state: StateFlow<ChatListState> = _state.asStateFlow()
 
     init {
+        updatePushToken()
+        
         val isStoriesEnabled = try {
             serverConfig.getServerConfig().features.stories
         } catch (e: Exception) {
@@ -50,6 +53,21 @@ class ChatListViewModel @Inject constructor(
         observeSignalREvents()
     }
 
+    private fun updatePushToken() {
+        com.google.firebase.messaging.FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+            if (task.isSuccessful) {
+                val token = task.result
+                viewModelScope.launch {
+                    try {
+                        authRepository.updatePushToken(token)
+                    } catch (e: Exception) {
+                        android.util.Log.e("ChatListVM", "Failed to update push token: ${e.message}")
+                    }
+                }
+            }
+        }
+    }
+
 
     private fun getCurrentUserId(): String = tokenManager.getUserId() ?: ""