Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import keys when same key available twice on keyserver (#1707) #1798

Closed
wants to merge 4 commits into from

Conversation

roryflynn
Copy link

#1707 Allow for import of keys when the same key is available twice on the keyserver.

KeyFormattingUtils.convertFingerprintToHex(publicKey.getFingerprint())
.equalsIgnoreCase(expectedFingerprint)
|| TextUtils.equals(Long.toString(publicKey.getKeyId()), expectedKeyId));
if (publicKeyMatches) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can reduce nesting depth in cases like this with something like if (!publicKeyMatches) { continue; }, which also makes it obvious that there is no else case

…yserver

Allow for import of keys when the same key is available twice on the keyserver.
@roryflynn roryflynn force-pushed the duplicatekeysbug branch 2 times, most recently from 6355a29 to f6c6369 Compare April 6, 2016 01:16
@roryflynn
Copy link
Author

@Valodim should be ready for another review!


boolean publicKeyMatches = ( fingerprintMatches || keyIdMatches );

if ( ! publicKeyMatches) { continue; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code style

@roryflynn
Copy link
Author

@Valodim Code style issues + comments should be fixed now

@Valodim
Copy link
Member

Valodim commented Apr 8, 2016

Would you add a positive and a negative unit test for the behavior you introduced? That would be awesome 👍

@dschuermann dschuermann changed the title -#1707 - import keys when same key available twice on keyserver Import keys when same key available twice on keyserver (#1707) Apr 29, 2016
@dschuermann
Copy link
Member

@roryflynn Still working on this PR?

@roryflynn
Copy link
Author

@dschuermann Apologies, not at the minute due to exams. Others are welcome to finish it off by creating the test cases though. If not, I'll try to finish it in about two weeks time.

@dschuermann
Copy link
Member

@roryflynn Take your time with the exams. We appreciate if you get back to us afterwards :)

@dschuermann dschuermann added this to the OpenKeychain 4.2 milestone Dec 5, 2016
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@Valodim
Copy link
Member

Valodim commented May 30, 2020

closing as stale

@Valodim Valodim closed this May 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants