diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-22 20:46:24 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-22 20:46:24 +0100 |
| commit | ba98fe4f864a7e9df9b001a84c5c4126c9d107be (patch) | |
| tree | b6c72977ed30f08c7b6cb688d391077216a7814b /src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | |
| parent | a6c5430cdd400389a311ea9c2ab8a6fabc2f72c5 (diff) | |
use extract account from intent method and final EXTRA_ACCOUNT variable
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java index ec9d59e1..2e415d5b 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java @@ -196,9 +196,8 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer protected boolean handleIntent(Intent intent) { if (intent != null && intent.getAction().equals(ACTION_VERIFY_CONTACT)) { - try { - this.mAccount = this.xmppConnectionService.findAccountByJid(Jid.fromString(intent.getExtras().getString("account"))); - } catch (final InvalidJidException ignored) { + this.mAccount = extractAccount(intent); + if (this.mAccount == null) { return false; } try { |