diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-29 22:35:28 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-29 22:35:28 +0200 |
commit | a0c4b022de514ef0334b8aa28662338519eb2071 (patch) | |
tree | beceb80779946decd8458910b6864c83a67e93d2 /src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | |
parent | e388dfc0b8c32ea5916ae6f803217061dac58663 (diff) | |
parent | bcf0d929dda50a3c8c94e5d384840bedc51d4e63 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java index 5c3f9bb3..9f4a4bc3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java @@ -7,6 +7,7 @@ import android.widget.EditText; import android.widget.Toast; import de.thedevstack.conversationsplus.ConversationsPlusColors; +import de.thedevstack.conversationsplus.utils.ui.TextViewUtil; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; @@ -39,9 +40,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti mNewPassword.setError(null); mNewPasswordConfirm.setError(null); xmppConnectionService.updateAccountPasswordOnServer(mAccount, newPassword, ChangePasswordActivity.this); - mChangePasswordButton.setEnabled(false); - mChangePasswordButton.setTextColor(ConversationsPlusColors.secondaryText()); - mChangePasswordButton.setText(R.string.updating); + TextViewUtil.disable(mChangePasswordButton, ConversationsPlusColors.secondaryText(), R.string.updating); } } } @@ -92,9 +91,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti @Override public void run() { mNewPassword.setError(getString(R.string.could_not_change_password)); - mChangePasswordButton.setEnabled(true); - mChangePasswordButton.setTextColor(ConversationsPlusColors.primaryText()); - mChangePasswordButton.setText(R.string.change_password); + TextViewUtil.enable(mChangePasswordButton, ConversationsPlusColors.primaryText(), R.string.change_password); } }); |