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

Added strings for conference security events

Browse source
This commit is contained in:
Sylvain Berfini 2025-01-16 09:52:59 +01:00
parent fee595cfdc
commit 375c020b9b
3 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt
View file

@ -37,6 +37,8 @@ class EventModel
val icon: Drawable?
init {
val name = getName()
text = when (eventLog.type) {
EventLog.Type.ConferenceCreated -> AppUtils.getString(
R.string.conversation_event_conference_created
@ -46,11 +48,11 @@ class EventModel
)
EventLog.Type.ConferenceParticipantAdded -> AppUtils.getFormattedString(
R.string.conversation_event_participant_added,
getName()
name
)
EventLog.Type.ConferenceParticipantRemoved -> AppUtils.getFormattedString(
R.string.conversation_event_participant_removed,
getName()
name
)
EventLog.Type.ConferenceSubjectChanged -> AppUtils.getFormattedString(
R.string.conversation_event_subject_changed,
@ -58,19 +60,19 @@ class EventModel
)
EventLog.Type.ConferenceParticipantSetAdmin -> AppUtils.getFormattedString(
R.string.conversation_event_admin_set,
getName()
name
)
EventLog.Type.ConferenceParticipantUnsetAdmin -> AppUtils.getFormattedString(
R.string.conversation_event_admin_unset,
getName()
name
)
EventLog.Type.ConferenceParticipantDeviceAdded -> AppUtils.getFormattedString(
R.string.conversation_event_device_added,
getName()
name
)
EventLog.Type.ConferenceParticipantDeviceRemoved -> AppUtils.getFormattedString(
R.string.conversation_event_device_removed,
getName()
name
)
EventLog.Type.ConferenceEphemeralMessageEnabled -> AppUtils.getString(
R.string.conversation_event_ephemeral_messages_enabled
@ -84,6 +86,23 @@ class EventModel
Locale.getDefault()
)
)
EventLog.Type.ConferenceSecurityEvent -> {
when (eventLog.securityEventType) {
EventLog.SecurityEventType.SecurityLevelDowngraded -> AppUtils.getFormattedString(
R.string.conversation_event_security_event_level_downgraded, name
)
EventLog.SecurityEventType.ParticipantMaxDeviceCountExceeded -> AppUtils.getFormattedString(
R.string.conversation_event_security_event_max_participant_count_exceeded, name
)
EventLog.SecurityEventType.EncryptionIdentityKeyChanged -> AppUtils.getFormattedString(
R.string.conversation_event_security_event_lime_identity_key_changed, name
)
EventLog.SecurityEventType.ManInTheMiddleDetected -> AppUtils.getFormattedString(
R.string.conversation_event_security_event_man_in_the_middle_detected, name
)
else -> eventLog.securityEventType.name
}
}
else -> {
eventLog.type.name
}
@ -97,7 +116,8 @@ class EventModel
EventLog.Type.ConferenceEphemeralMessageLifetimeChanged -> {
R.drawable.clock_countdown
}
EventLog.Type.ConferenceTerminated -> {
EventLog.Type.ConferenceTerminated,
EventLog.Type.ConferenceSecurityEvent -> {
R.drawable.warning_circle
}
EventLog.Type.ConferenceSubjectChanged -> {
@ -121,7 +141,11 @@ class EventModel
@WorkerThread
fun getName(): String {
val address = eventLog.participantAddress ?: eventLog.peerAddress
val address = if (eventLog.type == EventLog.Type.ConferenceSecurityEvent) {
eventLog.securityEventFaultyDeviceAddress
} else {
eventLog.participantAddress ?: eventLog.peerAddress
}
val name = if (address != null) {
coreContext.contactsManager.findDisplayName(address)
} else {

4
app/src/main/res/values-fr/strings.xml
View file

@ -517,6 +517,10 @@
<string name="conversation_event_ephemeral_messages_enabled">Messages éphémères activés</string>
<string name="conversation_event_ephemeral_messages_disabled">Messages éphémères désactivés</string>
<string name="conversation_event_ephemeral_messages_lifetime_changed">Messages éphémères : %s</string>
<string name="conversation_event_security_event_lime_identity_key_changed">Les clés de sécurité ont changé pour %s</string>
<string name="conversation_event_security_event_man_in_the_middle_detected">Attaque de l\'homme du milieu détectée pour %s</string>
<string name="conversation_event_security_event_level_downgraded">Baisse du niveau de sécurité due à %s</string>
<string name="conversation_event_security_event_max_participant_count_exceeded">Nombre maximum de terminaux dépassé pour %s</string>
<string name="conversation_details_media_documents_title">Médias &amp; documents</string>
<string name="conversation_media_list_title">Médias partagés</string>

4
app/src/main/res/values/strings.xml
View file

@ -557,6 +557,10 @@
<string name="conversation_event_ephemeral_messages_enabled">Ephemeral messages have been enabled</string>
<string name="conversation_event_ephemeral_messages_disabled">Ephemeral messages have been disabled</string>
<string name="conversation_event_ephemeral_messages_lifetime_changed">Ephemeral lifetime is now %s</string>
<string name="conversation_event_security_event_lime_identity_key_changed">LIME identity key changed for %s</string>
<string name="conversation_event_security_event_man_in_the_middle_detected">Man-in-the-middle attack detected for %s</string>
<string name="conversation_event_security_event_level_downgraded">Security level decreased because of %s</string>
<string name="conversation_event_security_event_max_participant_count_exceeded">Max participant count exceeded by %s</string>
<string name="conversation_details_media_documents_title">Media &amp; documents</string>
<string name="conversation_media_list_title">Shared media</string>