From 754eaca0f122052f05964dd777b8720fcd51d70b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 29 Oct 2018 09:35:21 +0100
Subject: [PATCH] Some improvements

---
 res/drawable-xhdpi/chat_delivered.png             | Bin 799 -> 0 bytes
 res/drawable/contacts_all.xml                     |   6 +++---
 res/drawable/contacts_sip.xml                     |   6 +++---
 res/drawable/history_all.xml                      |   6 +++---
 res/drawable/history_missed.xml                   |   6 +++---
 .../org/linphone/chat/ChatEventsAdapter.java      |   7 +------
 6 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 res/drawable-xhdpi/chat_delivered.png

diff --git a/res/drawable-xhdpi/chat_delivered.png b/res/drawable-xhdpi/chat_delivered.png
deleted file mode 100644
index 9d741055de31cb1e09060595830f1406db1d798b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 799
zcmV+)1K|9LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00O^BL_t(Y$Gw)%OH@%5$3N%32g8^S
zh{l)}n7PP>E5SizKoBb0gb2gT1OJBzYSFTw=wAq0gfb3>RHQ9x<3<pl;OHX7v68Y(
z0+k4LWZs+>sW{IW9X0wc&-d~@_ndovT;T}x_xE40EUQOEZUL8o^SjhfRsCX&d2Nh&
z8H>e!l+uu5#-X91X3z5;0lk3XXyk!m%d+mrVzI?z9VC;<UJ-c?oa1Ept*U*F<Gea(
zEVx}NmAWG$FHRv2P$?qA$z<|&(FjthR9sb)rP6i+sH(;t#~IppFfcH1(HQeVM5_2V
z_?64$uJ-lytr!5yvL2sByrQCl%F4=vrjTvhj{#(GaIg{hSVpxJMRj#G-QC@Y2&1E;
zY;JDuQ66yF06nJ_w=9c}jt*?wMnq860vhNss(SsjscCC#BNPe&kWQ!B+S>9TxnV@)
zir*RzhY5$nM~XKzG|<%41i<R*Dw#~CSUEM>KwZJ>ghF(6bs-{5O--@5c&IrE27|P>
zw*!#PW|^3n@TX@F^~PWK*=&}bot^y@)YsP+w!R3FNQ6Kj0D$Yd#Zpty$>04B#>U3T
z<#LD!ot>T3*4FOxEiEn7)%^`RlgY5Wyj)UTM7|kS{p2Us*Vh>zA4gTOEQ@F~N>x=A
zH8nM~wzdMWv9Uoqoj$G(J{x1qNHJz*WrgYKX#fI&0MTfaNF;)Ykk99toSek-yd%{`
z<c(3)k=>Dd2n!1f%+1a1KmJ}x&d$!VwzhWM?LAc;F^NQC33yiO)XdBbOG`@yk<HJ~
zm(wOs6N$uE8^H6t2gaCqsd?nOF1BqG3<hysx7=a(&_AxPsp{L^7C#Ges(RCLoc9F_
zCmxT#6Ons>o<TgXs(1Iq|NqJaa2#h?RU3gPz;+qJ+rSf5z3dm~xb^7!wlo6`yVN&T
d&6M+P`2(PF6nIW*lvw}(002ovPDHLkV1iMKdg1^8

diff --git a/res/drawable/contacts_all.xml b/res/drawable/contacts_all.xml
index 2e9d33e73..5ec1f5aa4 100644
--- a/res/drawable/contacts_all.xml
+++ b/res/drawable/contacts_all.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_all_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_all_selected" />
+        android:drawable="@drawable/contacts_all_selected" />
+    <item
+        android:drawable="@drawable/contacts_all_default" />
 </selector>
 
diff --git a/res/drawable/contacts_sip.xml b/res/drawable/contacts_sip.xml
index 089d67756..b70fb7c4c 100644
--- a/res/drawable/contacts_sip.xml
+++ b/res/drawable/contacts_sip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_sip_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_sip_selected" />
+        android:drawable="@drawable/contacts_sip_selected" />
+    <item
+        android:drawable="@drawable/contacts_sip_default" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/history_all.xml b/res/drawable/history_all.xml
index 2a20b0e07..21ae3a817 100644
--- a/res/drawable/history_all.xml
+++ b/res/drawable/history_all.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/history_all_default"/>
     <item android:state_enabled="false"
-         android:drawable="@drawable/history_all_selected" />
+        android:drawable="@drawable/history_all_selected" />
+    <item
+        android:drawable="@drawable/history_all_default"/>
 </selector>
 
diff --git a/res/drawable/history_missed.xml b/res/drawable/history_missed.xml
index e201649fb..1521d4756 100644
--- a/res/drawable/history_missed.xml
+++ b/res/drawable/history_missed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/history_missed_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/history_missed_selected" />
+        android:drawable="@drawable/history_missed_selected" />
+    <item
+        android:drawable="@drawable/history_missed_default" />
 </selector>
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 356454e00..80875fac1 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -209,12 +209,7 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
                     holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
                 }
 
-                if (status == ChatMessage.State.Delivered) {
-				    /*holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmLabel.setText(R.string.sent);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));*/
-                } else if (status == ChatMessage.State.DeliveredToUser) {
+                if (status == ChatMessage.State.DeliveredToUser) {
                     holder.imdmLayout.setVisibility(View.VISIBLE);
                     holder.imdmIcon.setImageResource(R.drawable.imdn_received);
                     holder.imdmLabel.setText(R.string.delivered);