Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
	src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index 2e415d5b..d94c9a1e 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -19,6 +19,8 @@ import com.google.zxing.integration.android.IntentResult;
 import net.java.otr4j.OtrException;
 import net.java.otr4j.session.Session;
 
+import de.thedevstack.conversationsplus.ConversationsPlusColors;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
@@ -380,14 +382,14 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 
 	protected void activateButton(Button button, int text, View.OnClickListener listener) {
 		button.setEnabled(true);
-		button.setTextColor(getPrimaryTextColor());
+		button.setTextColor(ConversationsPlusColors.primaryText());
 		button.setText(text);
 		button.setOnClickListener(listener);
 	}
 
 	protected void deactivateButton(Button button, int text) {
 		button.setEnabled(false);
-		button.setTextColor(getSecondaryTextColor());
+		button.setTextColor(ConversationsPlusColors.secondaryText());
 		button.setText(text);
 		button.setOnClickListener(null);
 	}