diff options
| author | lookshe <github@lookshe.org> | 2016-03-17 15:56:54 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-17 15:56:54 +0100 |
| commit | fb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (patch) | |
| tree | cf0fb5a62aefaf34fd8e134fa20c91fe641c0898 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
| parent | 25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (diff) | |
| parent | c4b1f6171d2bf82e44a3ba567f7732cc8beef717 (diff) | |
Merge tag '1.11.1' into trz/merge_1.11.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/utils/FileUtils.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-de/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-ru/strings.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 10 |
1 files changed, 5 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 0677fbd2..a01abb5b 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -744,7 +744,7 @@ public abstract class XmppActivity extends Activity { case UNTRUSTED: case TRUSTED: case TRUSTED_X509: - trustToggle.setChecked(trust.trusted()); + trustToggle.setChecked(trust.trusted(), false); trustToggle.setEnabled(trust != XmppAxolotlSession.Trust.TRUSTED_X509); if (trust == XmppAxolotlSession.Trust.TRUSTED_X509) { trustToggle.setOnClickListener(null); @@ -753,7 +753,7 @@ public abstract class XmppActivity extends Activity { keyType.setTextColor(getSecondaryTextColor()); break; case UNDECIDED: - trustToggle.setChecked(false); + trustToggle.setChecked(false, false); trustToggle.setEnabled(false); key.setTextColor(getPrimaryTextColor()); keyType.setTextColor(getSecondaryTextColor()); @@ -761,7 +761,7 @@ public abstract class XmppActivity extends Activity { case INACTIVE_UNTRUSTED: case INACTIVE_UNDECIDED: trustToggle.setOnClickListener(null); - trustToggle.setChecked(false); + trustToggle.setChecked(false, false); trustToggle.setEnabled(false); key.setTextColor(getTertiaryTextColor()); keyType.setTextColor(getTertiaryTextColor()); @@ -769,7 +769,7 @@ public abstract class XmppActivity extends Activity { case INACTIVE_TRUSTED: case INACTIVE_TRUSTED_X509: trustToggle.setOnClickListener(null); - trustToggle.setChecked(true); + trustToggle.setChecked(true, false); trustToggle.setEnabled(false); key.setTextColor(getTertiaryTextColor()); keyType.setTextColor(getTertiaryTextColor()); @@ -1181,7 +1181,7 @@ public abstract class XmppActivity extends Activity { } else { if (cancelPotentialWork(message, imageView)) { imageView.setBackgroundColor(0xff333333); - + imageView.setImageDrawable(null); final BitmapWorkerTask task = new BitmapWorkerTask(imageView, setSize); final AsyncDrawable asyncDrawable = new AsyncDrawable( getResources(), null, task); |