fixed enabling trust toggle. unknown->untrusted

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/crypto/axolotl/FingerprintStatus.java | 6 
src/main/java/eu/siacs/conversations/ui/XmppActivity.java                  | 5 
2 files changed, 7 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/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() {

src/main/java/eu/siacs/conversations/ui/XmppActivity.java

@@ -795,7 +795,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);
 					}
 				},
@@ -835,6 +835,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());
@@ -844,7 +845,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() {
@@ -858,7 +858,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) {