Issue 1168 ekm integration by DenBond7 · Pull Request #1316 · FlowCrypt/flowcrypt-android

DenBond7 · 2021-06-30T07:57:03Z

This PR added ekm integration

close #1168 // 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

# Conflicts: # FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/AddNewAccountActivityEnterpriseTest.kt # FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt # FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/DomainRulesResponse.kt # FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DomainRules.kt # FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt # FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt # FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/SubmitPubKeyViewModel.kt # FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSettingsFragment.kt # FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt

…nSignInFragment.| #1168

# Conflicts: # FlowCrypt/src/main/res/values/strings.xml

# Conflicts: # FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ChangePassPhraseActivity.kt # FlowCrypt/src/main/res/values/strings.xml

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/FlowcryptApiRepository.kt

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/EkmLoginViewModel.kt

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/EkmLoginViewModel.kt

…1168

DenBond7 · 2021-06-30T14:22:51Z

By the way, why I often make draft PRs? It helps me to see added changes and review them before ready

tomholub · 2021-06-30T15:04:16Z

By the way, why I often make draft PRs? It helps me to see added changes and review them before ready

Don't worry, I understand it's a draft and that it's early work. I'm just giving early feedback :-)

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/EkmViewModel.kt

tomholub · 2021-07-02T13:12:34Z

Otherwise, once tests are adjusted, this looks good. Thanks!

tomholub

How about tests - is there any test targeting the setup with EKM scenario?

DenBond7 · 2021-07-02T14:23:17Z

How about tests - is there any test targeting the setup with EKM scenario?

Not yet. I'm working on fixing the broken tests

tomholub · 2021-07-02T15:19:23Z

got it -it was not marked as a draft, so it confused me

…

On Friday, July 2, 2021, Den ***@***.***> wrote: How about tests - is there any test targeting the setup with EKM scenario? Not yet. I'm working on fixing the broken tests — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1316 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABQDZEO3NMNIU2ACYOJPBZLTVXDV7ANCNFSM47RYYD3Q> .

-- -- Tom James Holub <http://holub.me/>

IvanPizhenko

reviewed recent changes, no additional comments.

.../androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt

…1168

tomholub

Thanks!

DenBond7 added 15 commits May 3, 2021 15:04

Refactored code.| #1168

40180a4

Added some methods to OrgRules.| #1168

a83a7c3

Fixed errors after merge

2bff55e

Merge branch 'master' into issue_1168_ekm_integration

71b7441

Fixed OrgRules. Added skipping 'googlemail.com'.| #1168

0f0fe48

Renamed EnterpriseDomainRulesViewModel to EkmLoginViewModel.| #1168

b38d524

Modified EkmLoginViewModel. Added a dialog with 'retry' button in Mai…

803db55

…nSignInFragment.| #1168

Handled a case when orgRules.usesKeyManager() == false.| #1168

7e843d2

Added handling of OrgRulesCombinationNotSupportedException.| #1168

8cb4d03

Merge branch 'master' into issue_1168_ekm_integration

49177f5

# Conflicts: # FlowCrypt/src/main/res/values/strings.xml

Modifed logic in EkmLoginViewModel.| #1168

79b938a

Added '<ekm>/v1/keys/private' API things.| #1168

cda98e9

Merge branch 'master' into issue_1168_ekm_integration

a88cebb

# Conflicts: # FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ChangePassPhraseActivity.kt # FlowCrypt/src/main/res/values/strings.xml

Fixed compilation errors after merge.| #1168

3b01aec

DenBond7 added the PR submitted PR is submitted for this issue label Jun 30, 2021

DenBond7 added this to the 1.1.9 milestone Jun 30, 2021

tomholub reviewed Jun 30, 2021

View reviewed changes

DenBond7 added 4 commits June 30, 2021 14:41

Added handling errors for EkmPrivateKeysResponse.| #1168

3400d8c

Added 'Key' model. Modifed EkmPrivateKeysResponse.| #1168

3258a6e

Added showing an error if there are no private keys for a user(EKM).| #…

3f7b5ae

…1168

Refactored code.| #1168

f072e84

DenBond7 added 5 commits June 30, 2021 19:01

Rename EkmLoginViewModel to LoginViewModel.| #1168

fd2b9fd

Exported logic to separate ViewModel(s). Refactored code.| #1168

1ea598e

Improved retry police.| #1168

1bd10a4

Simplified logic of cheking for unsupported OrgRules combination.| #1168

2635485

Refactored code.| #1168

484f5ba

tomholub reviewed Jul 1, 2021

View reviewed changes

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/EkmViewModel.kt Show resolved Hide resolved

DenBond7 added 3 commits July 2, 2021 14:45

Modified logi of saving prv keys to the local database.| #1168

d615485

Fixed a bug in PgpKey after code refactoring.| #1168

4f2e9f5

Fixed typo.| #1168

535ebef

tomholub reviewed Jul 2, 2021

View reviewed changes

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/EkmViewModel.kt Outdated Show resolved Hide resolved

DenBond7 added 2 commits July 2, 2021 16:13

Improved parsing keys in EkmViewModel.| #1168

af5d257

Fixed typo.| #1168

2bccb7b

tomholub reviewed Jul 2, 2021

View reviewed changes

DenBond7 marked this pull request as draft July 2, 2021 15:41

DenBond7 added 2 commits July 2, 2021 20:18

Fixed AddOtherAccountFragmentTest.| #1168

48a62d8

Fixed SignInActivityEnterpriseTest.| #1168

08a0bc1

IvanPizhenko reviewed Jul 3, 2021

View reviewed changes

DenBond7 added 2 commits July 5, 2021 09:08

Fixed JUnit tests.| #1168

2ee68ca

Fixed lint warnings.| #1168

161afa1

seisvelas suggested changes Jul 6, 2021

View reviewed changes

.../androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt Outdated Show resolved Hide resolved

DenBond7 added 5 commits July 6, 2021 09:18

Fixed typo in names.| #1168

c29ffcc

Fixed retry policy in some tests

6094f34

Added some tests in SignInActivityEnterpriseTest.| #1168

b1a0b64

Added final tests in SignInActivityEnterpriseTest. Refactored code.| #…

01f2b49

…1168

SignInActivityEnterpriseTest. Refactored code.| #1168

6130fc3

DenBond7 marked this pull request as ready for review July 6, 2021 12:52

DenBond7 requested review from IvanPizhenko, seisvelas and tomholub July 6, 2021 12:52

IvanPizhenko approved these changes Jul 7, 2021

View reviewed changes

tomholub approved these changes Jul 7, 2021

View reviewed changes

tomholub merged commit 784ea44 into master Jul 7, 2021

tomholub deleted the issue_1168_ekm_integration branch July 7, 2021 17:24

Conversation

DenBond7 commented Jun 30, 2021

To be filled by reviewers

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DenBond7 commented Jun 30, 2021

Uh oh!

tomholub commented Jun 30, 2021

Uh oh!

Uh oh!

Uh oh!

tomholub commented Jul 2, 2021

Uh oh!

tomholub left a comment

Choose a reason for hiding this comment

Uh oh!

DenBond7 commented Jul 2, 2021

Uh oh!

tomholub commented Jul 2, 2021 via email

Uh oh!

IvanPizhenko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tomholub left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants