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.

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

#1221 UI for message passwords #1249

Merged
merged 25 commits into from
Dec 27, 2021
Merged

#1221 UI for message passwords #1249

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
11eff3c
#1221 add pwd param to composeEmail
sosnovsky Dec 15, 2021
b165507
#1221 update ui
sosnovsky Dec 16, 2021
97c7fd9
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 17, 2021
27838c4
#1221 update message validation
sosnovsky Dec 17, 2021
51db16d
#1221 update tests
sosnovsky Dec 17, 2021
735fafd
#1221 split ComposeMessageService
sosnovsky Dec 18, 2021
4556dd3
#1221 update ui reloading
sosnovsky Dec 20, 2021
c993e29
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 21, 2021
1e1ce94
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 21, 2021
2d2d5ca
#1221 update ui test
sosnovsky Dec 21, 2021
a1878ac
#1221 update tests
sosnovsky Dec 22, 2021
a729ec0
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 22, 2021
a1788dd
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 23, 2021
928156c
#1221 add check for domain password support
sosnovsky Dec 23, 2021
93d3582
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 23, 2021
78dc1d3
#1221 improve search handling
sosnovsky Dec 23, 2021
30fb7ae
#1221 code updates
sosnovsky Dec 23, 2021
4f24cda
Merge branch 'master' into feature/issue-1221-message-password
sosnovsky Dec 24, 2021
ad03900
#1221 pr comments updates
sosnovsky Dec 24, 2021
e83ed1a
#1221 update emailParts extension
sosnovsky Dec 24, 2021
43df3d9
#1221 fix tests
sosnovsky Dec 24, 2021
6fd51fb
#1221 add messagePassword getter
sosnovsky Dec 24, 2021
2bf0acf
#1221 message password alert update
sosnovsky Dec 24, 2021
75d353e
#1221 fix recipient selection crash
sosnovsky Dec 26, 2021
8aeea42
#1221 add ui test for recipient deletion
sosnovsky Dec 27, 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
26 changes: 22 additions & 4 deletions FlowCrypt.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
2C2A3B4B2719EE6100B7F27B /* KeyServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2A3B4A2719EE6100B7F27B /* KeyServiceTests.swift */; };
2C2A3B4D2719EF7300B7F27B /* PassPhraseServiceMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2A3B4C2719EF7300B7F27B /* PassPhraseServiceMock.swift */; };
2C2D0B95275FDF6B0052771D /* Version6SchemaMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2D0B94275FDF6B0052771D /* Version6SchemaMigration.swift */; };
2C339B07275CB136005DEA79 /* FatalErrorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C339B06275CB136005DEA79 /* FatalErrorViewController.swift */; };
2C4E60F72757D91A00DE5770 /* EncryptedStorageMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4E60F62757D91A00DE5770 /* EncryptedStorageMock.swift */; };
2C60AB0C272564D40040D7F2 /* InvalidStorageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C60AB0B272564D40040D7F2 /* InvalidStorageViewController.swift */; };
2CAF25322756C37E005C7C7C /* AppContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAF25312756C37E005C7C7C /* AppContext.swift */; };
Expand All @@ -62,10 +61,15 @@
32DCAF9DA9EC47798DF8BB73 /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32DCA9701B2D5052225A0414 /* SignInViewController.swift */; };
50531BE42629B9A80039BAE9 /* AttachmentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50531BE32629B9A80039BAE9 /* AttachmentNode.swift */; };
5109A77C272153B400D2CEB9 /* LeftAlignedCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5109A77B272153B400D2CEB9 /* LeftAlignedCollectionViewFlowLayout.swift */; };
511D07E12769FBBA0050417B /* MessagePasswordCellNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511D07E02769FBBA0050417B /* MessagePasswordCellNode.swift */; };
511D07E3276A2DF80050417B /* ButtonWithPaddingNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511D07E2276A2DF80050417B /* ButtonWithPaddingNode.swift */; };
512C1414271077F8002DE13F /* GoogleAPIClientForREST_PeopleService in Frameworks */ = {isa = PBXBuildFile; productRef = 512C1413271077F8002DE13F /* GoogleAPIClientForREST_PeopleService */; };
5133B6702716320F00C95463 /* ContactKeyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133B66F2716320F00C95463 /* ContactKeyDetailViewController.swift */; };
5133B6722716321F00C95463 /* ContactKeyDetailDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133B6712716321F00C95463 /* ContactKeyDetailDecorator.swift */; };
5133B6742716E5EA00C95463 /* LabelCellNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133B6732716E5EA00C95463 /* LabelCellNode.swift */; };
514C34DB276CE19C00FCAB79 /* ComposeMessageContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514C34DA276CE19C00FCAB79 /* ComposeMessageContext.swift */; };
514C34DD276CE1C000FCAB79 /* ComposeMessageRecipient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514C34DC276CE1C000FCAB79 /* ComposeMessageRecipient.swift */; };
514C34DF276CE20700FCAB79 /* ComposeMessageService+State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514C34DE276CE20700FCAB79 /* ComposeMessageService+State.swift */; };
5168FB0B274F94D300131072 /* MessageAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5168FB0A274F94D300131072 /* MessageAttachment.swift */; };
51775C32270B01C200D7C944 /* PrvKeyInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51775C31270B01C200D7C944 /* PrvKeyInfoTests.swift */; };
51775C39270C7D2400D7C944 /* StorageMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51775C38270C7D2400D7C944 /* StorageMethod.swift */; };
Expand Down Expand Up @@ -111,8 +115,8 @@
5ADEDCBC23A4329000EC495E /* PublicKeyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ADEDCBB23A4329000EC495E /* PublicKeyDetailViewController.swift */; };
5ADEDCBE23A4363700EC495E /* KeyDetailInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ADEDCBD23A4363700EC495E /* KeyDetailInfoViewController.swift */; };
5ADEDCC023A43B0800EC495E /* KeyDetailInfoViewDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ADEDCBF23A43B0800EC495E /* KeyDetailInfoViewDecorator.swift */; };
606FE33A2745AA2E009DA039 /* AttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 606FE3392745AA2E009DA039 /* AttachmentViewController.swift */; };
601EEE31272B19D200FE445B /* CheckMailAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 601EEE30272B19D200FE445B /* CheckMailAuthViewController.swift */; };
606FE33A2745AA2E009DA039 /* AttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 606FE3392745AA2E009DA039 /* AttachmentViewController.swift */; };
7F72537A0C44D3CE670F0EFD /* Pods_FlowCryptUIApplication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3382C015A576728FA08BA310 /* Pods_FlowCryptUIApplication.framework */; };
949ED9422303E3B400530579 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 949ED9412303E3B400530579 /* Colors.xcassets */; };
9F003D6125E1B4ED00EB38C0 /* TrashFolderProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F003D6025E1B4ED00EB38C0 /* TrashFolderProvider.swift */; };
Expand Down Expand Up @@ -454,7 +458,6 @@
2C2A3B4A2719EE6100B7F27B /* KeyServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyServiceTests.swift; sourceTree = "<group>"; };
2C2A3B4C2719EF7300B7F27B /* PassPhraseServiceMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassPhraseServiceMock.swift; sourceTree = "<group>"; };
2C2D0B94275FDF6B0052771D /* Version6SchemaMigration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Version6SchemaMigration.swift; sourceTree = "<group>"; };
2C339B06275CB136005DEA79 /* FatalErrorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FatalErrorViewController.swift; sourceTree = "<group>"; };
2C4E60F62757D91A00DE5770 /* EncryptedStorageMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptedStorageMock.swift; sourceTree = "<group>"; };
2C60AB0B272564D40040D7F2 /* InvalidStorageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvalidStorageViewController.swift; sourceTree = "<group>"; };
2CAF25312756C37E005C7C7C /* AppContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppContext.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -489,9 +492,14 @@
4F928D493732294B4E521900 /* Pods-FlowCryptUIApplication.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.release.xcconfig"; sourceTree = "<group>"; };
50531BE32629B9A80039BAE9 /* AttachmentNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentNode.swift; sourceTree = "<group>"; };
5109A77B272153B400D2CEB9 /* LeftAlignedCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftAlignedCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
511D07E02769FBBA0050417B /* MessagePasswordCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePasswordCellNode.swift; sourceTree = "<group>"; };
511D07E2276A2DF80050417B /* ButtonWithPaddingNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonWithPaddingNode.swift; sourceTree = "<group>"; };
5133B66F2716320F00C95463 /* ContactKeyDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactKeyDetailViewController.swift; sourceTree = "<group>"; };
5133B6712716321F00C95463 /* ContactKeyDetailDecorator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactKeyDetailDecorator.swift; sourceTree = "<group>"; };
5133B6732716E5EA00C95463 /* LabelCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelCellNode.swift; sourceTree = "<group>"; };
514C34DA276CE19C00FCAB79 /* ComposeMessageContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeMessageContext.swift; sourceTree = "<group>"; };
514C34DC276CE1C000FCAB79 /* ComposeMessageRecipient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeMessageRecipient.swift; sourceTree = "<group>"; };
514C34DE276CE20700FCAB79 /* ComposeMessageService+State.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ComposeMessageService+State.swift"; sourceTree = "<group>"; };
5168FB0A274F94D300131072 /* MessageAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageAttachment.swift; sourceTree = "<group>"; };
51775C31270B01C200D7C944 /* PrvKeyInfoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrvKeyInfoTests.swift; sourceTree = "<group>"; };
51775C38270C7D2400D7C944 /* StorageMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageMethod.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -532,8 +540,8 @@
5ADEDCBD23A4363700EC495E /* KeyDetailInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailInfoViewController.swift; sourceTree = "<group>"; };
5ADEDCBF23A43B0800EC495E /* KeyDetailInfoViewDecorator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailInfoViewDecorator.swift; sourceTree = "<group>"; };
5ADEDCC123A43C6800EC495E /* KeyTextCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyTextCellNode.swift; sourceTree = "<group>"; };
606FE3392745AA2E009DA039 /* AttachmentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentViewController.swift; sourceTree = "<group>"; };
601EEE30272B19D200FE445B /* CheckMailAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckMailAuthViewController.swift; sourceTree = "<group>"; };
606FE3392745AA2E009DA039 /* AttachmentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentViewController.swift; sourceTree = "<group>"; };
949ED9412303E3B400530579 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
9F003D6025E1B4ED00EB38C0 /* TrashFolderProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrashFolderProvider.swift; sourceTree = "<group>"; };
9F003D6C25EA8F3200EB38C0 /* SessionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionService.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1371,7 +1379,10 @@
isa = PBXGroup;
children = (
9F6F3BEC26ADF5DE005BD9C6 /* ComposeMessageService.swift */,
514C34DE276CE20700FCAB79 /* ComposeMessageService+State.swift */,
514C34DA276CE19C00FCAB79 /* ComposeMessageContext.swift */,
9F6F3BED26ADF5DE005BD9C6 /* ComposeMessageError.swift */,
514C34DC276CE1C000FCAB79 /* ComposeMessageRecipient.swift */,
);
path = "Compose Message Service";
sourceTree = "<group>";
Expand Down Expand Up @@ -2004,6 +2015,7 @@
5A39F433239EC61C001F4607 /* TitleCellNode.swift */,
5180CB9027356D48001FC7EF /* MessageSubjectNode.swift */,
9F82779D23737E3800E19C07 /* MessageTextSubjectNode.swift */,
511D07E02769FBBA0050417B /* MessagePasswordCellNode.swift */,
5180CB96273724E9001FC7EF /* ThreadMessageInfoCellNode.swift */,
9F56BD3123438B5B00A7371A /* InboxCellNode.swift */,
9F56BD3523438B9D00A7371A /* TextCellNode.swift */,
Expand Down Expand Up @@ -2031,6 +2043,7 @@
children = (
9F7ECCA6272C3FB4008A1770 /* TextImageNode.swift */,
51EBC56F2746A06600178DE8 /* TextWithIconNode.swift */,
511D07E2276A2DF80050417B /* ButtonWithPaddingNode.swift */,
9FA1988F253C841F008C9CF2 /* TableViewController.swift */,
9F696292236091DD003712E1 /* SignInImageNode.swift */,
9F696294236091F4003712E1 /* SignInDescriptionNode.swift */,
Expand Down Expand Up @@ -2568,6 +2581,7 @@
C132B9CB1EC2DE6400763715 /* GeneralConstants.swift in Sources */,
5ADEDCBE23A4363700EC495E /* KeyDetailInfoViewController.swift in Sources */,
D20D3C752520AB9A00D4AA9A /* BackupService.swift in Sources */,
514C34DB276CE19C00FCAB79 /* ComposeMessageContext.swift in Sources */,
C192421F1EC48B6900C3D251 /* SetupBackupsViewController.swift in Sources */,
9F0C3C2623194E0A00299985 /* FolderViewModel.swift in Sources */,
F8678DCC2722143300BB1710 /* GmailService+draft.swift in Sources */,
Expand All @@ -2589,6 +2603,7 @@
9F31AB932329950800CF87EA /* Imap+Backup.swift in Sources */,
9F589F15238C8249007FD759 /* KeyChainService.swift in Sources */,
2CC50FB12744167A0051629A /* Folder.swift in Sources */,
514C34DF276CE20700FCAB79 /* ComposeMessageService+State.swift in Sources */,
D2F41373243CC7990066AFB5 /* UserRealmObject.swift in Sources */,
F80E95362720B6640093F243 /* DraftsListProvider.swift in Sources */,
5A39F42D239EC321001F4607 /* SettingsViewController.swift in Sources */,
Expand Down Expand Up @@ -2751,6 +2766,7 @@
5ADEDCC023A43B0800EC495E /* KeyDetailInfoViewDecorator.swift in Sources */,
D227C0E6250538780070F805 /* RemoteFoldersProvider.swift in Sources */,
2CAF25322756C37E005C7C7C /* AppContext.swift in Sources */,
514C34DD276CE1C000FCAB79 /* ComposeMessageRecipient.swift in Sources */,
2CAF25342756C3A6005C7C7C /* ImapSessionProvider.swift in Sources */,
9F2AC5B1267BDED100F6149B /* GmailSearchExpressionGenerator.swift in Sources */,
9F953E09238310D500AEB98B /* KeyMethods.swift in Sources */,
Expand All @@ -2764,6 +2780,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
511D07E3276A2DF80050417B /* ButtonWithPaddingNode.swift in Sources */,
9F7ECCA7272C3FB4008A1770 /* TextImageNode.swift in Sources */,
D27177452424D44200BDA9A9 /* ComposeButtonNode.swift in Sources */,
D24FAFAB2520BFAE00BF46C5 /* CheckBoxNode.swift in Sources */,
Expand All @@ -2786,6 +2803,7 @@
D24FAFA42520BF9100BF46C5 /* CheckBoxCircleView.swift in Sources */,
D2CDC3D72404704D002B045F /* RecipientEmailsCellNode.swift in Sources */,
D2717752242567EB00BDA9A9 /* KeyTextCellNode.swift in Sources */,
511D07E12769FBBA0050417B /* MessagePasswordCellNode.swift in Sources */,
D211CE7B23FC59ED00D1CE38 /* InfoCellNode.swift in Sources */,
D2E26F7224F26FFF00612AF1 /* ContactUserCellNode.swift in Sources */,
D211CE6F23FC358000D1CE38 /* ButtonNode.swift in Sources */,
Expand Down
Loading