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

ensure cc-ed proceed is equivalent to accept

Browse source
This commit is contained in:
Daniel Gultsch 2022-11-22 10:13:07 +01:00
parent 9897fa3a45
commit e2f98f6bbc
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -952,16 +952,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
from.asBareJid().equals(id.account.getJid().asBareJid());
if (originatedFromMyself) {
if (transition(State.ACCEPTED)) {
if (serverMsgId != null) {
this.message.setServerMsgId(serverMsgId);
}
this.message.setTime(timestamp);
this.message.setCarbon(true); // indicate that call was accepted on other device
this.writeLogMessageSuccess(0);
this.xmppConnectionService
.getNotificationService()
.cancelIncomingCallNotification();
this.finish();
acceptedOnOtherDevice(serverMsgId, timestamp);
} else {
Log.d(
Config.LOGTAG,
@ -976,6 +967,19 @@ public class JingleRtpConnection extends AbstractJingleConnection
}
}
private void acceptedOnOtherDevice(final String serverMsgId, final long timestamp) {
if (serverMsgId != null) {
this.message.setServerMsgId(serverMsgId);
}
this.message.setTime(timestamp);
this.message.setCarbon(true); // indicate that call was accepted on other device
this.writeLogMessageSuccess(0);
this.xmppConnectionService
.getNotificationService()
.cancelIncomingCallNotification();
this.finish();
}
private void receiveReject(final Jid from, final String serverMsgId, final long timestamp) {
final boolean originatedFromMyself =
from.asBareJid().equals(id.account.getJid().asBareJid());
@ -1173,11 +1177,8 @@ public class JingleRtpConnection extends AbstractJingleConnection
id.account.getJid().asBareJid()
+ ": moved session with "
+ id.with
+ " into state accepted after received carbon copied procced");
this.xmppConnectionService
.getNotificationService()
.cancelIncomingCallNotification();
this.finish();
+ " into state accepted after received carbon copied proceed");
acceptedOnOtherDevice(serverMsgId, timestamp);
}
} else {
Log.d(