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

Updated submodules & cpim grammar + removed code from IMDN activity as it's now taking cared of in the lib

Browse source
This commit is contained in:
Sylvain Berfini 2018-04-27 14:46:42 +02:00
parent acc7d1469a
commit 96217bbc4f
8 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/raw/cpim_grammar
View file

Binary file not shown.

3
src/android/org/linphone/chat/ImdnFragment.java
View file

@ -198,7 +198,6 @@ public class ImdnFragment extends Fragment {
boolean first = true; boolean first = true;
for (ParticipantImdnState participant : participants) { for (ParticipantImdnState participant : participants) {
Address address = participant.getParticipant().getAddress(); Address address = participant.getParticipant().getAddress();
if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address); LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address); String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
@ -222,7 +221,6 @@ public class ImdnFragment extends Fragment {
first = true; first = true;
for (ParticipantImdnState participant : participants) { for (ParticipantImdnState participant : participants) {
Address address = participant.getParticipant().getAddress(); Address address = participant.getParticipant().getAddress();
if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address); LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address); String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
@ -246,7 +244,6 @@ public class ImdnFragment extends Fragment {
first = true; first = true;
for (ParticipantImdnState participant : participants) { for (ParticipantImdnState participant : participants) {
Address address = participant.getParticipant().getAddress(); Address address = participant.getParticipant().getAddress();
if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address); LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address); String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67 Subproject commit 7df8b5ca085010ec35103414ed9582412aaff97d

2
submodules/belcard

@ -1 +1 @@
Subproject commit 8c1027652d3219521a6d9112614066a9cc9f8cb1 Subproject commit 7376c8ba975617c8b2a7232c3acc428513a4ae8f

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit a9af682b9931213743c0af65e261e70e2280b1c9 Subproject commit cbb4ab4c2a58e4fa1954043f6b17266e1685c887

2
submodules/linphone

@ -1 +1 @@
Subproject commit 90ca06096cb4fa875e279f19f1bbcf5830dff4c5 Subproject commit 480cca5f5be39723359a30a319f64f37607cc437

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit 0be2e0ed887ea9db50666d98f0059c92a3f38ad8 Subproject commit ad4cdb240e553654f87438fb4519754e90d1773d

2
submodules/oRTP

@ -1 +1 @@
Subproject commit 996a3d651288e7976581c1b77e2a439c3cfb255d Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b