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

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);
 			}
 		});