diff options
| author | Christian S <christian@pix-art.de> | 2016-05-04 22:03:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-04 22:03:52 +0200 |
| commit | e840a51629bd6de238168c5fc9013a2bf50ed1f7 (patch) | |
| tree | 0740154bae719dc91b5446b5f9ef88602ad72ad9 /src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | |
| parent | 6a5563cc14e3595c65282c217e264cd717dd657b (diff) | |
| parent | 222d70d5e7219ab0206cca192952748fcd17bdbf (diff) | |
Merge branch 'refs/heads/news' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java index d924435d2..c9343b3d6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java @@ -73,6 +73,17 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti } @Override + protected void onStart() { + super.onStart(); + Intent intent = getIntent(); + String password = intent != null ? intent.getStringExtra("password") : null; + if (password != null) { + this.mNewPassword.getEditableText().clear(); + this.mNewPassword.getEditableText().append(password); + } + } + + @Override public void onPasswordChangeSucceeded() { runOnUiThread(new Runnable() { @Override |