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

Conflicts:
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/widget/Switch.java
	src/main/res/layout/account_row.xml
	src/main/res/layout/contact_key.xml

1 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index c709d842..0677fbd2 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -49,6 +49,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -71,6 +72,7 @@ import java.util.concurrent.RejectedExecutionException;
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
@@ -82,7 +84,6 @@ import eu.siacs.conversations.entities.MucOptions;
 import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
-import eu.siacs.conversations.ui.widget.Switch;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.xmpp.OnKeyStatusUpdated;
@@ -743,7 +744,7 @@ public abstract class XmppActivity extends Activity {
 			case UNTRUSTED:
 			case TRUSTED:
 			case TRUSTED_X509:
-				trustToggle.setChecked(trust.trusted(), false);
+				trustToggle.setChecked(trust.trusted());
 				trustToggle.setEnabled(trust != XmppAxolotlSession.Trust.TRUSTED_X509);
 				if (trust == XmppAxolotlSession.Trust.TRUSTED_X509) {
 					trustToggle.setOnClickListener(null);
@@ -752,7 +753,7 @@ public abstract class XmppActivity extends Activity {
 				keyType.setTextColor(getSecondaryTextColor());
 				break;
 			case UNDECIDED:
-				trustToggle.setChecked(false, false);
+				trustToggle.setChecked(false);
 				trustToggle.setEnabled(false);
 				key.setTextColor(getPrimaryTextColor());
 				keyType.setTextColor(getSecondaryTextColor());
@@ -760,7 +761,7 @@ public abstract class XmppActivity extends Activity {
 			case INACTIVE_UNTRUSTED:
 			case INACTIVE_UNDECIDED:
 				trustToggle.setOnClickListener(null);
-				trustToggle.setChecked(false, false);
+				trustToggle.setChecked(false);
 				trustToggle.setEnabled(false);
 				key.setTextColor(getTertiaryTextColor());
 				keyType.setTextColor(getTertiaryTextColor());
@@ -768,7 +769,7 @@ public abstract class XmppActivity extends Activity {
 			case INACTIVE_TRUSTED:
 			case INACTIVE_TRUSTED_X509:
 				trustToggle.setOnClickListener(null);
-				trustToggle.setChecked(true, false);
+				trustToggle.setChecked(true);
 				trustToggle.setEnabled(false);
 				key.setTextColor(getTertiaryTextColor());
 				keyType.setTextColor(getTertiaryTextColor());