Skip to content

Issue 1101 use pgpainless for msg decryption - #1420

Merged
IvanPizhenko merged 46 commits into
masterfrom
issue_1101_use_pgpainless_for_msg_decryption
Sep 21, 2021
Merged

Issue 1101 use pgpainless for msg decryption#1420
IvanPizhenko merged 46 commits into
masterfrom
issue_1101_use_pgpainless_for_msg_decryption

Conversation

@DenBond7

@DenBond7DenBond7 commented Aug 20, 2021•
edited by tomholub
Loading

Copy link
Copy Markdown
Collaborator

This PR adds changes to use PGPinless for the msg decryption

close#1101, #1455, #1353, #1456, #1355, #1348, #1354// if this PR closes an issue

Tests(delete all except exactly one):

  • Tests added or updated

To be filled by reviewers

I have reviewed that this PR... (tick whichever items you personally focused on during this review):

  • addresses the issue it closes (if any)
  • code is readable and understandable
  • is accompanied with tests, or tests are not needed
  • is free of vulnerabilities

@DenBond7DenBond7 added this to the 1.2.1: Kotlin decryption milestone Aug 20, 2021
@DenBond7
Updated build.gradle.|#1101
f8b7914
@DenBond7
Merge branch 'master' into issue_1101_use_pgpainless_for_msg_decryption
0865605
@DenBond7
Removed unused code. Refactored code.|#1101
1a3c7cc
@DenBond7
Fixed copyright.|#1101
5d47762
@DenBond7
Fixed copyright - step 2.|#1101
f17578a
@DenBond7
Merge branch 'master' into issue_1101_use_pgpainless_for_msg_decryption
d17d7a4
# Conflicts:
#	FlowCrypt/build.gradle
#	FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailApiHelper.kt
#	FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/LoadPrivateKeysViewModel.kt
#	FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt
#	FlowCrypt/src/main/java/com/flowcrypt/email/service/CheckClipboardToFindKeyService.kt
#	FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseImportKeyActivity.kt
#	FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CreateMessageFragment.kt
@DenBond7
Fixed issues after merge.|#1101
fd08cb6
@DenBond7
Merge branch 'master' into issue_1101_use_pgpainless_for_msg_decryption
43d463d
@DenBond7
Modified decryption errors handling.|#1101
926dc31
@DenBond7
Fixed a bug with key parsing on the message details screen.|#1101
366e28a
@DenBond7
Added displaying a message with a signed content.|#1101
d93f573
@DenBond7
Fixed extracting and displaying attachments.|#1101
0dcb928
@DenBond7
Fixed showing decrypted attachments.|#1101
57cf6f2
@DenBond7
Refactored code.|#1101
3bc7db0
@DenBond7
Refactored code.|#1101
3ce472d
@DenBond7
wip
bb8e405
@DenBond7DenBond7 mentioned this pull request Sep 20, 2021
Closed
@DenBond7DenBond7 mentioned this pull request Sep 20, 2021
Closed
@DenBond7DenBond7 linked an issue Sep 21, 2021 that may be closed by this pull request
Kotlin decryption. Fix download attachments where attInfo.rawData?.isNotEmpty() == true #1455
Closed
This was referenced Sep 21, 2021
Closed
Closed
@DenBond7
DenBond7 marked this pull request as ready for review September 21, 2021 09:37
@DenBond7

DenBond7 commented Sep 21, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@IvanPizhenko@tomholub I've marked it as ready for a review. It's a huge PR(due to difficulty). Sorry for that, but I didn't find a way to make it simpler.

@DenBond7

DenBond7 commented Sep 21, 2021

Copy link
Copy Markdown
CollaboratorAuthor

while you are reviewing I'm going to think about #1360

tomholub
tomholub approved these changes Sep 21, 2021
View reviewed changes

@tomholubtomholub left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks great. I love PRs that remove lots of code.

I haven't tested it yet.

Comment thread...rypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
Comment threadFlowCrypt/src/main/assets/html/license.htm
Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockFactory.kt
Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/core/msg/MsgBlockParser.kt
Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecrypt.kt
Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpSignature.kt
@tomholubtomholub mentioned this pull request Sep 21, 2021
Closed
This was referenced Sep 21, 2021
Closed
Closed
Closed
Closed
Closed
@tomholubtomholub mentioned this pull request Sep 21, 2021
Closed
@tomholub

tomholub commented Sep 21, 2021

Copy link
Copy Markdown
Collaborator

I tested this and it works. I did find some bugs that may not be related, most notably #1476

@DenBond7

DenBond7 commented Sep 21, 2021

Copy link
Copy Markdown
CollaboratorAuthor

I tested this and it works.

Can I merge it?

@tomholub

tomholub commented Sep 21, 2021

Copy link
Copy Markdown
Collaborator

For me it's ok to merge. @IvanPizhenko before this is released please also have a look so that we would still have a chance to improve it if you notice something.

@IvanPizhenko
IvanPizhenko merged commit c1cd175 into masterSep 21, 2021
@IvanPizhenko
IvanPizhenko deleted the issue_1101_use_pgpainless_for_msg_decryption branch September 21, 2021 21:59
@IvanPizhenko

IvanPizhenko commented Sep 21, 2021

Copy link
Copy Markdown
Contributor

No objections. Merged it.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tomholubtomholubtomholub approved these changes
+1 more reviewer
@IvanPizhenkoIvanPizhenkoIvanPizhenko approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

1.2.2: Kotlin decryption

3 participants

@DenBond7@tomholub@IvanPizhenko