narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

OTR & another.im #23

Merged
Sergei Poljanski merged 65 commits from develop into master 2024-12-09 18:42:00 +00:00
Conversation 0 Commits 65 Files changed 245 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e1e2de8a76 - Show all commits

10
src/main/java/eu/siacs/conversations/crypto/OtrService.java
View file

@ -107,7 +107,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
public void askForSecret(SessionID id, InstanceTag instanceTag, String question) { public void askForSecret(SessionID id, InstanceTag instanceTag, String question) {
try { try {
final Jid jid = OtrJidHelper.fromSessionID(id); final Jid jid = OtrJidHelper.fromSessionID(id);
Conversation conversation = this.mXmppConnectionService.find(this.account, jid, null); Conversation conversation = this.mXmppConnectionService.find(this.account, jid, jid);
if (conversation != null) { if (conversation != null) {
conversation.smp().hint = question; conversation.smp().hint = question;
conversation.smp().status = Conversation.Smp.STATUS_CONTACT_REQUESTED; conversation.smp().status = Conversation.Smp.STATUS_CONTACT_REQUESTED;
@ -187,7 +187,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
MessageGenerator.addMessageHints(packet); MessageGenerator.addMessageHints(packet);
try { try {
Jid jid = OtrJidHelper.fromSessionID(session); Jid jid = OtrJidHelper.fromSessionID(session);
Conversation conversation = mXmppConnectionService.find(account, jid, null); Conversation conversation = mXmppConnectionService.find(account, jid, jid);
if (conversation != null && conversation.setOutgoingChatState(Config.DEFAULT_CHAT_STATE)) { if (conversation != null && conversation.setOutgoingChatState(Config.DEFAULT_CHAT_STATE)) {
if (mXmppConnectionService.sendChatStates()) { if (mXmppConnectionService.sendChatStates()) {
packet.addChild(ChatState.toElement(conversation.getOutgoingChatState())); packet.addChild(ChatState.toElement(conversation.getOutgoingChatState()));
@ -233,7 +233,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
private void setSmpStatus(SessionID id, int status) { private void setSmpStatus(SessionID id, int status) {
try { try {
final Jid jid = OtrJidHelper.fromSessionID(id); final Jid jid = OtrJidHelper.fromSessionID(id);
Conversation conversation = this.mXmppConnectionService.find(this.account, jid, null); Conversation conversation = this.mXmppConnectionService.find(this.account, jid, jid);
if (conversation != null) { if (conversation != null) {
conversation.smp().status = status; conversation.smp().status = status;
mXmppConnectionService.updateConversationUi(); mXmppConnectionService.updateConversationUi();
@ -264,7 +264,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
public void sendOtrErrorMessage(SessionID session, String errorText) { public void sendOtrErrorMessage(SessionID session, String errorText) {
try { try {
Jid jid = OtrJidHelper.fromSessionID(session); Jid jid = OtrJidHelper.fromSessionID(session);
Conversation conversation = mXmppConnectionService.find(account, jid, null); Conversation conversation = mXmppConnectionService.find(account, jid, jid);
String id = conversation == null ? null : conversation.getLastReceivedOtrMessageId(); String id = conversation == null ? null : conversation.getLastReceivedOtrMessageId();
if (id != null) { if (id != null) {
MessagePacket packet = mXmppConnectionService.getMessageGenerator() MessagePacket packet = mXmppConnectionService.getMessageGenerator()
@ -290,7 +290,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
Log.d(Config.LOGTAG, "OtrService.verify(" + id.toString() + "," + fingerprint + "," + String.valueOf(approved) + ")"); Log.d(Config.LOGTAG, "OtrService.verify(" + id.toString() + "," + fingerprint + "," + String.valueOf(approved) + ")");
try { try {
final Jid jid = OtrJidHelper.fromSessionID(id); final Jid jid = OtrJidHelper.fromSessionID(id);
Conversation conversation = this.mXmppConnectionService.find(this.account, jid, null); Conversation conversation = this.mXmppConnectionService.find(this.account, jid, jid);
if (conversation != null) { if (conversation != null) {
if (approved) { if (approved) {
conversation.getContact().addOtrFingerprint(fingerprint); conversation.getContact().addOtrFingerprint(fingerprint);