mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove reply action in message notification if account is not in secure mode and message is received in a unsecure conversation

Browse source
This commit is contained in:
Sylvain Berfini 2024-02-23 10:04:22 +01:00
parent 8e104114f7
commit a7c63c748a
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -64,6 +64,7 @@ import org.linphone.core.MediaDirection
import org.linphone.core.tools.Log
import org.linphone.ui.call.CallActivity
import org.linphone.ui.main.MainActivity
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.utils.AppUtils
import org.linphone.utils.FileUtils
import org.linphone.utils.LinphoneUtils
@ -564,6 +565,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
notifiable.isGroup = true
notifiable.groupTitle = chatRoom.subject
}
notifiable.isEncrypted = chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt())
for (message in chatRoom.unreadHistory) {
if (message.isRead || message.isOutgoing) continue
@ -879,6 +881,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
return builder.build()
}
@WorkerThread
private fun createMessageNotification(
notifiable: Notifiable,
pendingIntent: PendingIntent,
@ -937,7 +940,6 @@ class NotificationsManager @MainThread constructor(private val context: Context)
.setShowWhen(true)
.setStyle(style)
.setContentIntent(pendingIntent)
.addAction(getReplyMessageAction(notifiable))
.addAction(getMarkMessageAsReadAction(notifiable))
.setShortcutId(id)
.setLocusId(LocusIdCompat(id))
@ -946,6 +948,17 @@ class NotificationsManager @MainThread constructor(private val context: Context)
notificationBuilder.addPerson(person)
}
if (notifiable.isEncrypted) {
notificationBuilder.addAction(getReplyMessageAction(notifiable))
} else {
val account = coreContext.core.accountList.find {
it.params.identityAddress?.asStringUriOnly() == notifiable.localIdentity
}
if (account != null && !account.isInSecureMode()) {
notificationBuilder.addAction(getReplyMessageAction(notifiable))
}
}
return notificationBuilder.build()
}
@ -1226,6 +1239,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
var remoteAddress: String? = null
var isGroup: Boolean = false
var isEncrypted: Boolean = false
var groupTitle: String? = null
val messages: ArrayList<NotifiableMessage> = arrayListOf()
}