From 96217bbc4f5436498f125d43de0c7d530fb8707a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 27 Apr 2018 14:46:42 +0200
Subject: [PATCH] Updated submodules & cpim grammar + removed code from IMDN
 activity as it's now taking cared of in the lib

---
 res/raw/cpim_grammar                          | Bin 5239 -> 5346 bytes
 .../org/linphone/chat/ImdnFragment.java       |   3 ---
 submodules/bctoolbox                          |   2 +-
 submodules/belcard                            |   2 +-
 submodules/belle-sip                          |   2 +-
 submodules/linphone                           |   2 +-
 submodules/mediastreamer2                     |   2 +-
 submodules/oRTP                               |   2 +-
 8 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/res/raw/cpim_grammar b/res/raw/cpim_grammar
index 6f8b36d954a126b6509342fa2bd3096c72aa2c24..066afb55811392f443765d48c539188ba12c945a 100644
GIT binary patch
delta 367
zcmeya@kn!n2cs@)a(-S(YF>$MMrvY8YEdx*5HS7+0u~U9i3=jkz?EE-lg6;wgE4`b
zk#+J)7PHAuSvGCnz*@#!&%%|PT3no%o(eYtqL>TaWQZ^ms%i#Cpfwy^X+`<DQ2h*C
zCHZh>N@7WBNoFq0Y@j=m;c~^LNm;4M2{5NKaOD-l<%&`ZOEZfQ+MwQGMYSBmx2Vz(
zUvJ*Rd7h0I8W6f=i8-aIlV=DNaC3p(Rh*fg$1qu3uvLNy!3X(?iIG8@k&!`{aq}F(
G+e`qn!*!AX

delta 239
zcmaE)`CVg!2jk{a#sp?Yw#nC6%viaSi*nK?bF*$1O-xBGDrNwI|3JW%kqQ#nyo<Gp
zxt<luD`o&IXF%h!f^`82Mivl@2~C<MH?_DpF+Ei`Ges9-Do7PGSS=SLgD)c^Ln;s#
zLvbRIPKS!=0%=c1entitMs@}(1qQB?{Or`c&B9#g*%(<TH?oRO{veRg&&0q8vX+rS
S8>n2DadMVm>t=SL+e`p5Q#X77

diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java
index a41489930..55374c510 100644
--- a/src/android/org/linphone/chat/ImdnFragment.java
+++ b/src/android/org/linphone/chat/ImdnFragment.java
@@ -198,7 +198,6 @@ public class ImdnFragment extends Fragment {
 		boolean first = true;
 		for (ParticipantImdnState participant : participants) {
 			Address address = participant.getParticipant().getAddress();
-			if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
 
 			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
 			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
@@ -222,7 +221,6 @@ public class ImdnFragment extends Fragment {
 		first = true;
 		for (ParticipantImdnState participant : participants) {
 			Address address = participant.getParticipant().getAddress();
-			if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
 
 			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
 			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
@@ -246,7 +244,6 @@ public class ImdnFragment extends Fragment {
 		first = true;
 		for (ParticipantImdnState participant : participants) {
 			Address address = participant.getParticipant().getAddress();
-			if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
 
 			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
 			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index e9473d2e5..7df8b5ca0 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67
+Subproject commit 7df8b5ca085010ec35103414ed9582412aaff97d
diff --git a/submodules/belcard b/submodules/belcard
index 8c1027652..7376c8ba9 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit 8c1027652d3219521a6d9112614066a9cc9f8cb1
+Subproject commit 7376c8ba975617c8b2a7232c3acc428513a4ae8f
diff --git a/submodules/belle-sip b/submodules/belle-sip
index a9af682b9..cbb4ab4c2 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit a9af682b9931213743c0af65e261e70e2280b1c9
+Subproject commit cbb4ab4c2a58e4fa1954043f6b17266e1685c887
diff --git a/submodules/linphone b/submodules/linphone
index 90ca06096..480cca5f5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 90ca06096cb4fa875e279f19f1bbcf5830dff4c5
+Subproject commit 480cca5f5be39723359a30a319f64f37607cc437
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 0be2e0ed8..ad4cdb240 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0be2e0ed887ea9db50666d98f0059c92a3f38ad8
+Subproject commit ad4cdb240e553654f87438fb4519754e90d1773d
diff --git a/submodules/oRTP b/submodules/oRTP
index 996a3d651..1fcd6fd15 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit 996a3d651288e7976581c1b77e2a439c3cfb255d
+Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b