narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

JMI: send 'ringing' and receipts only for contacts

Browse source 
fixes #110
This commit is contained in:
Daniel Gultsch 2023-10-01 08:05:36 +02:00
parent ac3ce93c56
commit 0dca7f8a5a
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -849,9 +849,22 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
if (serverMsgId == null) { if (serverMsgId == null) {
serverMsgId = extractStanzaId(account, packet); serverMsgId = extractStanzaId(account, packet);
} }
mXmppConnectionService.getJingleConnectionManager().deliverMessage(account, packet.getTo(), packet.getFrom(), child, remoteMsgId, serverMsgId, timestamp); mXmppConnectionService
if (!account.getJid().asBareJid().equals(from.asBareJid()) && remoteMsgId != null) { .getJingleConnectionManager()
processMessageReceipts(account, packet, remoteMsgId, query); .deliverMessage(
account,
packet.getTo(),
packet.getFrom(),
child,
remoteMsgId,
serverMsgId,
timestamp);
final Contact contact = account.getRoster().getContact(from);
if (mXmppConnectionService.confirmMessages()
&& !contact.isSelf()
&& remoteMsgId != null
&& contact.showInContactList()) {
processMessageReceipts(account, packet, remoteMsgId, null);
} }
} else if (query.isCatchup()) { } else if (query.isCatchup()) {
if ("propose".equals(action)) { if ("propose".equals(action)) {

2
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
View file

@ -1505,7 +1505,9 @@ public class JingleRtpConnection extends AbstractJingleConnection
} }
this.message.setTime(timestamp); this.message.setTime(timestamp);
startRinging(); startRinging();
if (xmppConnectionService.confirmMessages() && id.getContact().showInContactList()) {
sendJingleMessage("ringing"); sendJingleMessage("ringing");
}
} else { } else {
Log.d( Log.d(
Config.LOGTAG, Config.LOGTAG,