Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed security event display

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-26 16:19:55 +01:00
parent 8d10836a59
commit 69d25ff746
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
View file

@ -105,8 +105,8 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
eventLayout = view.findViewById(R.id.event); eventLayout = view.findViewById(R.id.event);
eventMessage = view.findViewById(R.id.event_text); eventMessage = view.findViewById(R.id.event_text);
securityEventLayout = view.findViewById(R.id.event); securityEventLayout = view.findViewById(R.id.security_event);
securityEventMessage = view.findViewById(R.id.event_text); securityEventMessage = view.findViewById(R.id.security_event_text);
rightAnchor = view.findViewById(R.id.rightAnchor); rightAnchor = view.findViewById(R.id.rightAnchor);
bubbleLayout = view.findViewById(R.id.bubble); bubbleLayout = view.findViewById(R.id.bubble);

1
app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
View file

@ -181,7 +181,6 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
break; break;
case ConferenceSecurityEvent: case ConferenceSecurityEvent:
holder.securityEventLayout.setVisibility(View.VISIBLE); holder.securityEventLayout.setVisibility(View.VISIBLE);
holder.securityEventMessage.setText("TODO");
switch (event.getSecurityEventType()) { switch (event.getSecurityEventType()) {
case EncryptionIdentityKeyChanged: case EncryptionIdentityKeyChanged:

4
app/src/main/res/layout/chat_bubble.xml
View file

@ -58,8 +58,8 @@
<TextView <TextView
android:id="@+id/security_event_text" android:id="@+id/security_event_text"
android:textAppearance="@style/font_group_chat_event" android:textAppearance="@style/font_group_chat_security_event"
android:background="@color/colorI" android:background="@color/colorH"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"

8
app/src/main/res/values/styles.xml
View file

@ -223,4 +223,12 @@
<item name="android:textStyle">italic</item> <item name="android:textStyle">italic</item>
</style> </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> </resources>