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/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index d94c9a1e..a310b6ce 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -20,6 +20,7 @@ import net.java.otr4j.OtrException;
 import net.java.otr4j.session.Session;
 
 import de.thedevstack.conversationsplus.ConversationsPlusColors;
+import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -381,16 +382,12 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 	}
 
 	protected void activateButton(Button button, int text, View.OnClickListener listener) {
-		button.setEnabled(true);
-		button.setTextColor(ConversationsPlusColors.primaryText());
-		button.setText(text);
+        TextViewUtil.enable(button, ConversationsPlusColors.primaryText(), text);
 		button.setOnClickListener(listener);
 	}
 
 	protected void deactivateButton(Button button, int text) {
-		button.setEnabled(false);
-		button.setTextColor(ConversationsPlusColors.secondaryText());
-		button.setText(text);
+        TextViewUtil.disable(button, ConversationsPlusColors.secondaryText(), text);
 		button.setOnClickListener(null);
 	}