ensure cc-ed proceed is equivalent to accept
This commit is contained in:
parent
9897fa3a45
commit
e2f98f6bbc
|
@ -952,16 +952,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
|
||||||
from.asBareJid().equals(id.account.getJid().asBareJid());
|
from.asBareJid().equals(id.account.getJid().asBareJid());
|
||||||
if (originatedFromMyself) {
|
if (originatedFromMyself) {
|
||||||
if (transition(State.ACCEPTED)) {
|
if (transition(State.ACCEPTED)) {
|
||||||
if (serverMsgId != null) {
|
acceptedOnOtherDevice(serverMsgId, timestamp);
|
||||||
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();
|
|
||||||
} else {
|
} else {
|
||||||
Log.d(
|
Log.d(
|
||||||
Config.LOGTAG,
|
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) {
|
private void receiveReject(final Jid from, final String serverMsgId, final long timestamp) {
|
||||||
final boolean originatedFromMyself =
|
final boolean originatedFromMyself =
|
||||||
from.asBareJid().equals(id.account.getJid().asBareJid());
|
from.asBareJid().equals(id.account.getJid().asBareJid());
|
||||||
|
@ -1173,11 +1177,8 @@ public class JingleRtpConnection extends AbstractJingleConnection
|
||||||
id.account.getJid().asBareJid()
|
id.account.getJid().asBareJid()
|
||||||
+ ": moved session with "
|
+ ": moved session with "
|
||||||
+ id.with
|
+ id.with
|
||||||
+ " into state accepted after received carbon copied procced");
|
+ " into state accepted after received carbon copied proceed");
|
||||||
this.xmppConnectionService
|
acceptedOnOtherDevice(serverMsgId, timestamp);
|
||||||
.getNotificationService()
|
|
||||||
.cancelIncomingCallNotification();
|
|
||||||
this.finish();
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Log.d(
|
Log.d(
|
||||||
|
|
Loading…
Reference in a new issue