aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-17 20:51:43 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-17 20:51:43 +0100
commitea71720faaa39661e2d34258e3a3e97e37d83cd6 (patch)
treea5a2a0335f3255184d19af2d21e8925bc188ce38
parent3765d552926951452b34fb024e8d50f000c6baab (diff)
fixed enabling trust toggle. unknown->untrusted
-rw-r--r--src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java6
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java5
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java b/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java
index 38aef325e..c7939411e 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java
@@ -74,7 +74,11 @@ public class FingerprintStatus {
}
public boolean isTrusted() {
- return trust == Trust.TRUSTED || trust == Trust.VERIFIED || trust == Trust.VERIFIED_X509;
+ return trust == Trust.TRUSTED || isVerified();
+ }
+
+ public boolean isVerified() {
+ return trust == Trust.VERIFIED || trust == Trust.VERIFIED_X509;
}
public boolean isCompromised() {
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index c4a92c44c..95dc62d7d 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -790,7 +790,7 @@ public abstract class XmppActivity extends Activity {
new View.OnClickListener() {
@Override
public void onClick(View v) {
- account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(true));
+ account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false));
v.setEnabled(true);
}
},
@@ -830,6 +830,7 @@ public abstract class XmppActivity extends Activity {
keyType.setOnLongClickListener(purge);
boolean x509 = Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509;
final View.OnClickListener toast;
+ trustToggle.setChecked(status.isTrusted(), false);
if (status.isActive()) {
key.setTextColor(getPrimaryTextColor());
keyType.setTextColor(getSecondaryTextColor());
@@ -839,7 +840,6 @@ public abstract class XmppActivity extends Activity {
trustToggle.setEnabled(false);
} else {
trustToggle.setOnClickListener(null);
- trustToggle.setChecked(status.isTrusted(), false);
trustToggle.setEnabled(true);
}
toast = new View.OnClickListener() {
@@ -853,7 +853,6 @@ public abstract class XmppActivity extends Activity {
keyType.setTextColor(getTertiaryTextColor());
trustToggle.setOnClickListener(null);
trustToggle.setEnabled(false);
- trustToggle.setChecked(status.isTrusted(), false);
toast = new View.OnClickListener() {
@Override
public void onClick(View v) {