aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-07 22:48:17 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 07:00:40 -0500
commit02db197a89fb7b305f03f3bc0f3a55dd0abaa268 (patch)
tree1d3c2020e712c0b922b251c7f5801b9578e60ba2 /src/main
parentcc34c60255c4b7c055491d291f0f81f5191caa06 (diff)
Fix crash on account creation
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index f9c7d5269..d1aba067a 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -232,18 +232,6 @@ public class EditAccountActivity extends XmppActivity {
});
}
- protected boolean inputDataDiffersFromAccount() {
- if (mAccount == null) {
- return true;
- } else {
- return (!mAccount.getJid().equals(mAccountJid.getText().toString()))
- || (!mAccount.getPassword().equals(
- mPassword.getText().toString()) || mAccount
- .isOptionSet(Account.OPTION_REGISTER) != mRegisterNew
- .isChecked());
- }
- }
-
protected void updateSaveButton() {
if (mAccount != null
&& mAccount.getStatus() == Account.STATUS_CONNECTING) {
@@ -348,7 +336,8 @@ public class EditAccountActivity extends XmppActivity {
if (getIntent() != null) {
try {
this.jidToEdit = Jid.fromString(getIntent().getStringExtra("jid"));
- } catch (final InvalidJidException ignored) {
+ } catch (final InvalidJidException | NullPointerException ignored) {
+ this.jidToEdit = null;
}
if (this.jidToEdit != null) {
this.mRegisterNew.setVisibility(View.GONE);