From 69d25ff746914fe93f4a1421af4139303775f83b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 26 Nov 2018 16:19:55 +0100
Subject: [PATCH] Fixed security event display

---
 .../java/org/linphone/chat/ChatMessageViewHolder.java     | 4 ++--
 .../main/java/org/linphone/chat/ChatMessagesAdapter.java  | 1 -
 app/src/main/res/layout/chat_bubble.xml                   | 4 ++--
 app/src/main/res/values/styles.xml                        | 8 ++++++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
index 3057b2c9f..832c5f919 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
@@ -105,8 +105,8 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
         eventLayout = view.findViewById(R.id.event);
         eventMessage = view.findViewById(R.id.event_text);
 
-        securityEventLayout = view.findViewById(R.id.event);
-        securityEventMessage = view.findViewById(R.id.event_text);
+        securityEventLayout = view.findViewById(R.id.security_event);
+        securityEventMessage = view.findViewById(R.id.security_event_text);
 
         rightAnchor = view.findViewById(R.id.rightAnchor);
         bubbleLayout = view.findViewById(R.id.bubble);
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
index eccf8d0e8..705390a3e 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
@@ -181,7 +181,6 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
                     break;
                 case ConferenceSecurityEvent:
                     holder.securityEventLayout.setVisibility(View.VISIBLE);
-                    holder.securityEventMessage.setText("TODO");
 
                     switch (event.getSecurityEventType()) {
                         case EncryptionIdentityKeyChanged:
diff --git a/app/src/main/res/layout/chat_bubble.xml b/app/src/main/res/layout/chat_bubble.xml
index 49cc22cdd..ff024034f 100644
--- a/app/src/main/res/layout/chat_bubble.xml
+++ b/app/src/main/res/layout/chat_bubble.xml
@@ -58,8 +58,8 @@
 
         <TextView
             android:id="@+id/security_event_text"
-            android:textAppearance="@style/font_group_chat_event"
-            android:background="@color/colorI"
+            android:textAppearance="@style/font_group_chat_security_event"
+            android:background="@color/colorH"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 97e0a87b6..1aa17252c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -223,4 +223,12 @@
         <item name="android:textStyle">italic</item>
     </style>
 
+    <style name="font_group_chat_security_event" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/colorI</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingExtra">0sp</item>
+        <item name="android:textStyle">italic</item>
+    </style>
+
 </resources>
\ No newline at end of file