From 04c8250738f4eeee0206c992db041d8f8a299523 Mon Sep 17 00:00:00 2001
From: Brieuc Viel <brieuc.viel@belledonne-communications.com>
Date: Thu, 30 Mar 2017 16:43:45 +0200
Subject: [PATCH] [LIME] new icons incerter

---
 res/drawable-xhdpi/chat_secure.png    | Bin 0 -> 449 bytes
 res/drawable-xhdpi/chat_unsecure.png  | Bin 0 -> 298 bytes
 res/layout/chat_bubble.xml            |   3 ++-
 src/org/linphone/ChatFragment.java    |  12 +++++++-----
 src/org/linphone/LinphoneManager.java |   3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable-xhdpi/chat_secure.png
 create mode 100644 res/drawable-xhdpi/chat_unsecure.png

diff --git a/res/drawable-xhdpi/chat_secure.png b/res/drawable-xhdpi/chat_secure.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc4b9378667abe068103646b29640266242a2c75
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq000sI000;W1^@s6_f@Si00004XF*Lt006O%
z3;baP0004aNkl<ZI1%ksJxjw-6utME5X29hoLog6T^t<z4+>J7QaU(0>25{^om@o-
zHNhhI6BPXe;v^D^qu|iN55zX+dSA$Wq-jgtZ6JB)opbI<a`Rpg`W%%?WjcwI9R%E9
zc|Nm51aze=brJ-@Td@p_gzLI%kiaDo%@#F1N5of9uo;HoU0&}Bs+OutF~s+5aPp=;
z_}c<&x!$Nhilzj3o~L4rPkAmOErn{^cI-KQYRp<I^E=wBYoy*15IsdM5UlDsKmMmp
z_KJVuH$~_1tX8VscChonuRWo?X$`=+_L#(k65Uui4*W(}NXlp2p_n*uU9bs4!UZ95
z3~vM%N7k+lN3bZ^1QF7Vkj{_uEVwx4wS0{U;x%KwVB2a_F+k>dEnkD~mb;&t2zGhF
zO=--{KH}jc<$Eua+?zd3bI?0qj#FGNl?UFvH)AkkUTv`DZ^|fWc%Mc+`qw?Oc&ERl
r9UvIz|BLyR4DSl>elFnM|E0aZg5h%!7%s!J00000NkvXXu0mjf7MH}p

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/chat_unsecure.png b/res/drawable-xhdpi/chat_unsecure.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c80434d8e7a75cceb6562b316969ae327bbce3d
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq000sI000{Z1^@s6alzl800004XF*Lt006O%
z3;baP0002tNkl<ZI1%lVF%E)25Jd+<w6wONAYQ<NLs;n%xCb||@d#c)LuctJD6Flm
zG*tK}nT?Yj7c@2`LipL)KaZbfAfmw45^d00LkmGJSdS6WLH6AX0#fJ%wE=N2?MwlX
zLAOAF4rV5M8-_*<omEJKdJC;YT(jo_nT<^t%tAqT)Jq>?58|E+D}08~tQ1fhKnyUY
z;wr<TSt}qnz$++MTx~csuL_tOKpEhsqKUH;SA4VLUut~bPTeOy+z&4(!O-?{`k8u*
w9sGyd_m&YJ!2SC*ycvxr>i??ajQ)B?Pn_U^d&Kd(yZ`_I07*qoM6N<$g4vgKUH||9

literal 0
HcmV?d00001

diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 39692013a..74c25108f 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -146,7 +146,8 @@
 		    android:layout_alignTop="@id/background"
 			android:layout_width="15dp"
 			android:layout_height="15dp"
-			android:paddingTop="5dp">
+			android:paddingTop="5dp"
+			android:paddingBottom="3dp">
 			
 			<ImageView
 				android:id="@+id/status"
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 8b098257b..1d24c70a0 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -745,7 +745,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				dialog.dismiss();
 			}
 		});
-		dialog.show();
+		if(LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory)
+			dialog.show();
 	}
 
 	private LinphoneChatMessage getMessageForId(int id) {
@@ -1048,7 +1049,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 			@Override
 			public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) {
-					Log.e(" /////////====>> onLinphoneChatMessageStateChanged - state = "+state.toString());
+
 			}
 
 			@Override
@@ -1192,10 +1193,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 			if (status == LinphoneChatMessage.State.InProgress) {
 				holder.messageSendingInProgress.setVisibility(View.VISIBLE);
-			} else if (!message.isSecured() && !message.isOutgoing() &&
-					LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory) {
+			}
+			if (!message.isSecured() && !message.isOutgoing() &&
+					LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory && status != LinphoneChatMessage.State.InProgress) {
 				holder.messageStatus.setVisibility(View.VISIBLE);
-				holder.messageStatus.setImageResource(R.drawable.lime_ko);
+				holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
 			}
 			if(status == State.DeliveredToUser && message.isOutgoing()){
 				holder.imdmLayout.setVisibility(View.VISIBLE);
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index d91ba26f4..e84ff60c7 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1107,7 +1107,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 						LinphoneManager.getInstance().setAreDisplayAlertMessage(false);
 					}
 				});
-				dialog.show();
+				if(LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory)
+					dialog.show();
 			}
 		} catch (Exception e) {
 			Log.e(e);