show 'show inactive keys' button also when there are no active keys
This commit is contained in:
parent
23a91e5019
commit
ecd53580c0
|
@ -468,6 +468,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
|
||||||
boolean showsInactive = false;
|
boolean showsInactive = false;
|
||||||
for (final XmppAxolotlSession session : contact.getAccount().getAxolotlService().findSessionsForContact(contact)) {
|
for (final XmppAxolotlSession session : contact.getAccount().getAxolotlService().findSessionsForContact(contact)) {
|
||||||
final FingerprintStatus trust = session.getTrust();
|
final FingerprintStatus trust = session.getTrust();
|
||||||
|
hasKeys |= !trust.isCompromised();
|
||||||
if (!trust.isActive()) {
|
if (!trust.isActive()) {
|
||||||
if (showInactiveOmemo) {
|
if (showInactiveOmemo) {
|
||||||
showsInactive = true;
|
showsInactive = true;
|
||||||
|
@ -478,7 +479,6 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
|
||||||
}
|
}
|
||||||
if (!trust.isCompromised()) {
|
if (!trust.isCompromised()) {
|
||||||
boolean highlight = session.getFingerprint().equals(messageFingerprint);
|
boolean highlight = session.getFingerprint().equals(messageFingerprint);
|
||||||
hasKeys = true;
|
|
||||||
addFingerprintRow(keys, session, highlight);
|
addFingerprintRow(keys, session, highlight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue