narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

use lower case otr fingerprints for comparison

Browse source
This commit is contained in:
Daniel Gultsch 2016-11-18 13:13:29 +01:00
parent 9d9a9e63ad
commit a7ee8f8a74
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Contact.java
View file

@ -301,7 +301,7 @@ public class Contact implements ListItem, Blockable {
for (int i = 0; i < prints.length(); ++i) { for (int i = 0; i < prints.length(); ++i) {
final String print = prints.isNull(i) ? null : prints.getString(i); final String print = prints.isNull(i) ? null : prints.getString(i);
if (print != null && !print.isEmpty()) { if (print != null && !print.isEmpty()) {
fingerprints.add(prints.getString(i)); fingerprints.add(prints.getString(i).toLowerCase(Locale.US));
} }
} }
} }

3
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.crypto.PgpDecryptionService; import eu.siacs.conversations.crypto.PgpDecryptionService;
@ -627,7 +628,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
return null; return null;
} }
DSAPublicKey remotePubKey = (DSAPublicKey) getOtrSession().getRemotePublicKey(); DSAPublicKey remotePubKey = (DSAPublicKey) getOtrSession().getRemotePublicKey();
this.otrFingerprint = getAccount().getOtrService().getFingerprint(remotePubKey); this.otrFingerprint = getAccount().getOtrService().getFingerprint(remotePubKey).toLowerCase(Locale.US);
} catch (final OtrCryptoException | UnsupportedOperationException ignored) { } catch (final OtrCryptoException | UnsupportedOperationException ignored) {
return null; return null;
} }