Skip to content

Highlight mixed or partial signatures #1105

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.

Sign up for GitHub

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

Merged
tomholub merged 3 commits into from
Nov 29, 2021
Merged

Highlight mixed or partial signatures #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba8afbb
Highlight mixed or partial signatures
ivan-ushakov Nov 26, 2021
4adbbb2
Merge branch 'master' into feature/issue-1004
ivan-ushakov Nov 29, 2021
a015aaf
UI test
ivan-ushakov Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions FlowCrypt/Functionality/Mail Provider/Message Provider/MessageService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,23 @@ struct ProcessedMessage {
}

enum MessageSignature: Hashable {
case good, unsigned, error(String), missingPubkey(String), bad, pending
case good, goodMixed, unsigned, error(String), missingPubkey(String), partial, bad, pending

var message: String {
switch self {
case .good:
return "message_signed".localized
case .goodMixed:
return "message_signature_good_mixed".localized
case .unsigned:
return "message_not_signed".localized
case .error(let message):
return "message_signature_verify_error".localizeWithArguments(message)
case .missingPubkey(let longid):
let message = "message_missing_pubkey".localizeWithArguments(longid)
return "message_signature_verify_error".localizeWithArguments(message)
case .partial:
return "message_signature_partial".localized
case .bad:
return "message_bad_signature".localized
case .pending:
Expand All @@ -44,9 +48,9 @@ struct ProcessedMessage {

var icon: String {
switch self {
case .good:
case .good, .goodMixed:
return "lock"
case .error, .missingPubkey:
case .error, .missingPubkey, .partial:
return "exclamationmark.triangle"
case .unsigned, .bad:
return "xmark"
Expand All @@ -57,9 +61,9 @@ struct ProcessedMessage {

var color: UIColor {
switch self {
case .good:
case .good, .goodMixed:
return .main
case .error, .missingPubkey:
case .error, .missingPubkey, .partial:
return .warningColor
Comment on lines 62 to 67
Copy link
Collaborator

@tomholub tomholub Nov 29, 2021

Choose a reason for hiding this comment

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

.error should use .errorColor, not .warningColor

case .unsigned, .bad:
return .errorColor
Expand Down Expand Up @@ -280,6 +284,10 @@ extension MessageService {

guard signature.match == true else { return .bad }

guard signature.partial != true else { return .partial }

guard signature.mixed != true else { return .goodMixed }

return .good
}
}
Expand Down
2 changes: 2 additions & 0 deletions FlowCrypt/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
"message_encrypted" = "encrypted";
"message_not_encrypted" = "not encrypted";
"message_signed" = "signed";
"message_signature_good_mixed" = "signed with mixed keys";
"message_not_signed" = "not signed";
"message_missing_pubkey" = "no public key %@";
"message_signature_partial" = "only partially signed";
"message_signature_verify_error" = "cannot verify signature: %@";
"message_bad_signature" = "bad signature";
"message_signature_pending" = "verifying signature...";
Expand Down
10 changes: 10 additions & 0 deletions appium/tests/specs/inbox/CheckAllEmailSignatureCases.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,15 @@ describe('INBOX: ', () => {
await EmailScreen.checkEncryptionBadge('not encrypted');
await EmailScreen.checkSignatureBadge('bad signature');
await EmailScreen.clickBackButton();

await SearchScreen.clickBackButton();

// partially signed only message
await MailFolderScreen.clickSearchButton();
await SearchScreen.searchAndClickEmailBySubject('Partially signed only message');

await EmailScreen.checkEncryptionBadge('not encrypted');
await EmailScreen.checkSignatureBadge('only partially signed');
await EmailScreen.clickBackButton();
});
});