From ba98fe4f864a7e9df9b001a84c5c4126c9d107be Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 22 Jan 2016 20:46:24 +0100
Subject: use extract account from intent method and final EXTRA_ACCOUNT
 variable

---
 .../java/eu/siacs/conversations/ui/ChangePasswordActivity.java   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java')

diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
index aa986bd1..ccb3a22e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -50,14 +50,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
 
 	@Override
 	void onBackendConnected() {
-		try {
-			final String jid = getIntent() == null ? null : getIntent().getStringExtra("account");
-			if (jid != null) {
-				this.mAccount = xmppConnectionService.findAccountByJid(Jid.fromString(jid));
-			}
-		} catch (final InvalidJidException ignored) {
-
-		}
+		this.mAccount = extractAccount(getIntent());
 
 	}
 
-- 
cgit v1.2.3