From 701c21ae4a1117205232f8fe7adab68d1c669954 Mon Sep 17 00:00:00 2001 From: kosyak Date: Thu, 10 Oct 2024 01:01:17 +0200 Subject: [PATCH] fix empty OTR verification window --- .../java/eu/siacs/conversations/ui/ConversationsActivity.java | 1 + src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index a999c3bf6..c30669104 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -836,6 +836,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class); intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT); intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString()); + intent.putExtra("counterpart", conversation.getNextCounterpart().toString()); intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString()); switch (menuItem.getItemId()) { case R.id.ask_question: diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java index 2eb69e5e2..dd9ec29df 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java @@ -200,7 +200,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer return false; } try { - this.mConversation = this.xmppConnectionService.find(this.mAccount, Jid.of(intent.getExtras().getString("contact")), null); + this.mConversation = this.xmppConnectionService.find(this.mAccount, Jid.of(intent.getExtras().getString("contact")), Jid.of(intent.getExtras().getString("counterpart"))); if (this.mConversation == null) { return false; }