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

fixed regression that would crash create contact dialog. fixes #2131

Browse source
This commit is contained in:
Daniel Gultsch 2016-11-19 10:29:08 +01:00
parent 2b9b3be3f1
commit 1820b163a1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -401,7 +401,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
EnterJidDialog dialog = new EnterJidDialog( EnterJidDialog dialog = new EnterJidDialog(
this, mKnownHosts, mActivatedAccounts, this, mKnownHosts, mActivatedAccounts,
getString(R.string.create_contact), getString(R.string.create), getString(R.string.create_contact), getString(R.string.create),
prefilledJid, null, !invite.hasFingerprints() prefilledJid, null, invite == null || !invite.hasFingerprints()
); );
dialog.setOnEnterJidDialogPositiveListener(new EnterJidDialog.OnEnterJidDialogPositiveListener() { dialog.setOnEnterJidDialogPositiveListener(new EnterJidDialog.OnEnterJidDialogPositiveListener() {
@ -420,8 +420,10 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
if (contact.showInRoster()) { if (contact.showInRoster()) {
throw new EnterJidDialog.JidError(getString(R.string.contact_already_exists)); throw new EnterJidDialog.JidError(getString(R.string.contact_already_exists));
} else { } else {
//contact.addOtrFingerprint(fingerprint);
xmppConnectionService.createContact(contact); xmppConnectionService.createContact(contact);
if (invite != null && invite.hasFingerprints()) {
xmppConnectionService.verifyFingerprints(contact,invite.getFingerprints());
}
switchToConversation(contact); switchToConversation(contact);
return true; return true;
} }