1 files changed, 26 insertions, 20 deletions
diff --git a/src/main/java/de/pixart/messenger/OmemoActivity.java b/src/main/java/de/pixart/messenger/OmemoActivity.java
index dcf420442..85e0498a7 100644
--- a/src/main/java/de/pixart/messenger/OmemoActivity.java
+++ b/src/main/java/de/pixart/messenger/OmemoActivity.java
@@ -16,6 +16,7 @@ import android.widget.Toast;
 import java.security.cert.X509Certificate;
 
 import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
+import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.ui.XmppActivity;
 import de.pixart.messenger.ui.widget.Switch;
@@ -60,27 +61,33 @@ public abstract class OmemoActivity extends XmppActivity {
         }
     }
 
-    protected boolean addFingerprintRow(LinearLayout keys, final Account account, final String fingerprint, boolean highlight) {
-        final FingerprintStatus status = account.getAxolotlService().getFingerprintTrust(fingerprint);
-        return status != null && addFingerprintRowWithListeners(keys, account, fingerprint, highlight, status, true, true, new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                account.getAxolotlService().setFingerprintTrust(fingerprint, FingerprintStatus.createActive(isChecked));
-            }
-        });
+    protected void addFingerprintRow(LinearLayout keys, final XmppAxolotlSession session, boolean highlight) {
+        final Account account = session.getAccount();
+        final String fingerprint = session.getFingerprint();
+        addFingerprintRowWithListeners(keys,
+                session.getAccount(),
+                session.getFingerprint(),
+                highlight,
+                session.getTrust(),
+                true,
+                true,
+                new CompoundButton.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        account.getAxolotlService().setFingerprintTrust(fingerprint, FingerprintStatus.createActive(isChecked));
+                    }
+                });
     }
 
-    protected boolean addFingerprintRowWithListeners(LinearLayout keys, final Account account,
-                                                     final String fingerprint,
-                                                     boolean highlight,
-                                                     FingerprintStatus status,
-                                                     boolean showTag,
-                                                     boolean undecidedNeedEnablement,
-                                                     CompoundButton.OnCheckedChangeListener
-                                                             onCheckedChangeListener) {
-        if (status.isCompromised()) {
-            return false;
-        }
+    protected void addFingerprintRowWithListeners(LinearLayout keys, final Account account,
+                                                  final String fingerprint,
+                                                  boolean highlight,
+                                                  FingerprintStatus status,
+                                                  boolean showTag,
+                                                  boolean undecidedNeedEnablement,
+                                                  CompoundButton.OnCheckedChangeListener
+                                                          onCheckedChangeListener) {
+
         View view = getLayoutInflater().inflate(R.layout.contact_key, keys, false);
         TextView key = (TextView) view.findViewById(R.id.key);
         TextView keyType = (TextView) view.findViewById(R.id.key_type);
@@ -184,7 +191,6 @@ public abstract class OmemoActivity extends XmppActivity {
         key.setText(CryptoHelper.prettifyFingerprint(fingerprint.substring(2)));
 
         keys.addView(view);
-        return true;
     }
 
     public void showPurgeKeyDialog(final Account account, final String fingerprint) {