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

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 +2 -1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 701c21ae4a - Show all commits

1
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -836,6 +836,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class); Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class);
intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT); intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString()); intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString());
intent.putExtra("counterpart", conversation.getNextCounterpart().toString());
intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString()); intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString());
switch (menuItem.getItemId()) { switch (menuItem.getItemId()) {
case R.id.ask_question: case R.id.ask_question:

2
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
View file

@ -200,7 +200,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
return false; return false;
} }
try { 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) { if (this.mConversation == null) {
return false; return false;
} }