diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-04 18:22:17 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-04 18:22:17 +0200 |
| commit | fb41a4ffaa8aa8d47955cbb75cc0ba97107517a3 (patch) | |
| tree | 4cb83751d8b71a009caa5e463e858e1f4abab1cd | |
| parent | 16eb1bfbd0a11d53380d043bf1f62feb7a6b6f22 (diff) | |
fixed npe when calling changepassword activity directly
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java index d4ef4090..750a1da3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java @@ -86,8 +86,10 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti protected void onStart() { super.onStart(); Intent intent = getIntent(); - String password = intent != null ? intent.getStringExtra("password") : ""; - this.mNewPassword.getEditableText().append(password); + String password = intent != null ? intent.getStringExtra("password") : null; + if (password != null) { + this.mNewPassword.getEditableText().append(password); + } } @Override |