Rosetta/mobile-android
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Implement user blocking check in MessageRepository and ChatViewModel to ignore messages from blocked users

Browse Source
This commit is contained in:
k1ngsterr1
2026-01-14 00:14:42 +05:00
parent f9c1425403
commit e14de42c5f
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/rosetta/messenger/data/MessageRepository.kt
View File

@@ -242,16 +242,6 @@ class MessageRepository private constructor(private val context: Context) {
android.util.Log.d("MessageRepository", "📩 handleIncomingMessage START") android.util.Log.d("MessageRepository", "📩 handleIncomingMessage START")
android.util.Log.d("MessageRepository", " from: ${packet.fromPublicKey.take(20)}...") android.util.Log.d("MessageRepository", " from: ${packet.fromPublicKey.take(20)}...")
// 🔥 Генерируем messageId если он пустой (как в Архиве - generateRandomKeyFormSeed)
val messageId = if (packet.messageId.isBlank()) {
generateMessageId(packet.fromPublicKey, packet.toPublicKey, packet.timestamp)
} else {
packet.messageId
}
android.util.Log.d("MessageRepository", " messageId: $messageId (original: ${packet.messageId})")
android.util.Log.d("MessageRepository", " currentAccount: ${currentAccount?.take(20) ?: "NULL"}...")
android.util.Log.d("MessageRepository", " currentPrivateKey: ${if (currentPrivateKey != null) "SET" else "NULL"}")
val account = currentAccount ?: run { val account = currentAccount ?: run {
android.util.Log.e("MessageRepository", "❌ ABORT: currentAccount is NULL!") android.util.Log.e("MessageRepository", "❌ ABORT: currentAccount is NULL!")
return return
@@ -261,6 +251,23 @@ class MessageRepository private constructor(private val context: Context) {
return return
} }
// 🔥 Проверяем, не заблокирован ли отправитель
val isBlocked = database.blacklistDao().isUserBlocked(packet.fromPublicKey, account)
if (isBlocked) {
android.util.Log.d("MessageRepository", "🚫 BLOCKED: Ignoring message from blocked user ${packet.fromPublicKey.take(20)}...")
return
}
// 🔥 Генерируем messageId если он пустой (как в Архиве - generateRandomKeyFormSeed)
val messageId = if (packet.messageId.isBlank()) {
generateMessageId(packet.fromPublicKey, packet.toPublicKey, packet.timestamp)
} else {
packet.messageId
}
android.util.Log.d("MessageRepository", " messageId: $messageId (original: ${packet.messageId})")
android.util.Log.d("MessageRepository", " currentAccount: ${account.take(20)}...")
android.util.Log.d("MessageRepository", " currentPrivateKey: SET")
// Проверяем, не дубликат ли (используем сгенерированный messageId) // Проверяем, не дубликат ли (используем сгенерированный messageId)
val isDuplicate = messageDao.messageExists(account, messageId) val isDuplicate = messageDao.messageExists(account, messageId)
android.util.Log.d("MessageRepository", " isDuplicate: $isDuplicate") android.util.Log.d("MessageRepository", " isDuplicate: $isDuplicate")

6
app/src/main/java/com/rosetta/messenger/ui/chats/ChatViewModel.kt
View File

@@ -200,6 +200,12 @@ class ChatViewModel(application: Application) : AndroidViewModel(application) {
val privateKey = myPrivateKey ?: return@launch val privateKey = myPrivateKey ?: return@launch
val account = myPublicKey ?: return@launch val account = myPublicKey ?: return@launch
// 🔥 Проверяем блокировку (как в Архиве)
val isBlocked = database.blacklistDao().isUserBlocked(packet.fromPublicKey, account)
if (isBlocked) {
Log.d(TAG, "🚫 BLOCKED: Ignoring message from blocked user ${packet.fromPublicKey.take(20)}...")
return@launch
}
// Расшифровываем в фоне - получаем и текст и plainKeyAndNonce // Расшифровываем в фоне - получаем и текст и plainKeyAndNonce
val decryptResult = MessageCrypto.decryptIncomingFull( val decryptResult = MessageCrypto.decryptIncomingFull(