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

support multiple pub keys per recipient #1523

Merged
merged 39 commits into from
Nov 25, 2021
Merged

support multiple pub keys per recipient #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
21ca549
Added PublicKeyEntity. Refactored code. WIP.| #1188
DenBond7 Oct 23, 2021
ae23630
Fixed using ContactsDao.getAllContactsWithPgpLD().| #1188
DenBond7 Oct 25, 2021
77c8855
Fixed using ContactsDao.getAllContactsWithPgp()/getAllContactsWithPgp…
DenBond7 Oct 26, 2021
faa2e23
Renamed ContactEntity to RecipientEntity.| #1188
DenBond7 Oct 26, 2021
fda5a76
Renamed ContactsDao to RecipientDao.| #1188
DenBond7 Oct 26, 2021
91de167
Refactored code.| #1188
DenBond7 Oct 26, 2021
905aacf
Renamed ContactsViewModel to RecipientsViewModel.| #1188
DenBond7 Oct 26, 2021
55355f0
Fixed a few methods in RecipientDao. Refactored code.| #1188
DenBond7 Oct 26, 2021
c36f3ad
Fixed RecipientDao.getRecipientByEmail().| #1188
DenBond7 Oct 26, 2021
5803a9e
Fixed some moments with adding/updating a recipient with a pub key.| …
DenBond7 Oct 26, 2021
8f1644a
Made a workable version after switching to use 'recipients' and 'pub_…
DenBond7 Nov 1, 2021
d22ae4c
Fixed tests. Refactored code.| #1188
DenBond7 Nov 5, 2021
81874c2
Modified code to use a new logic to save contacts on the compose scre…
DenBond7 Nov 9, 2021
daa76eb
Modified code to use a new logic to apply colors to recipients(chips)…
DenBond7 Nov 10, 2021
8874988
Added changes to use all recipient's pub keys for ecnryption + use al…
DenBond7 Nov 10, 2021
bd9334f
Fixed signing option.| #1541
DenBond7 Nov 10, 2021
ece204c
Import recipients manually. Refactored code. Added LookUpPubKeysDialo…
DenBond7 Nov 10, 2021
9ec0be6
Added a base realization of importing pub keys manually.| #1542
DenBond7 Nov 12, 2021
1dd39c8
Added ImportAllPubKeysFromSourceDialogFragment.| #1542
DenBond7 Nov 17, 2021
02bbd10
Removed unused source.| #1542
DenBond7 Nov 18, 2021
57bddc7
Improved some classes.| #1566
DenBond7 Nov 19, 2021
4676fc2
Added RecipientDetailsFragment.| #1566
DenBond7 Nov 19, 2021
e69ff95
Fixed opening PublicKeyDetailsFragment. Refactored code.| #1566
DenBond7 Nov 19, 2021
beedaae
Fixed exporting pub key.| #1566
DenBond7 Nov 19, 2021
d12d609
Fixed deleting pub key.| #1566
DenBond7 Nov 19, 2021
13226a9
Fixed editing pub key.| #1566
DenBond7 Nov 23, 2021
44b85c6
Fixed database migration bug.| #1188
DenBond7 Nov 23, 2021
36d1d11
Fixed nav_graph.xml for test.| #1188
DenBond7 Nov 23, 2021
abc45b1
Temporary disabled some tests.| #1188
DenBond7 Nov 23, 2021
a41dcf0
Temporary disabled some tests(step 2).| #1188
DenBond7 Nov 23, 2021
b7fdee2
Fixed Junit tests.| #1188
DenBond7 Nov 23, 2021
09724be
Fixed some UI tests.| #1188
DenBond7 Nov 23, 2021
775f473
Merge remote-tracking branch 'origin/master' into issue_1188_support_…
DenBond7 Nov 25, 2021
c84d571
Fixed merge conflicts.| #1188
DenBond7 Nov 25, 2021
1a76ddd
Fixed some PR comments. Refactored code.| #1188
DenBond7 Nov 25, 2021
e6e08c2
Fixed some PR comments. Refactored code. Step 2.| #1188
DenBond7 Nov 25, 2021
b9a8b9d
Restored some code.| #1188
DenBond7 Nov 25, 2021
35a6e09
Renamed a file.| #1188
DenBond7 Nov 25, 2021
1170e2f
Fixed importing/updating pub keys for PublicKeyMsgBlock.| #1188
DenBond7 Nov 25, 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
3 changes: 2 additions & 1 deletion FlowCrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ android {
devTest {
versionNameSuffix "_devTest"
buildConfigField 'boolean', 'IS_ACRA_ENABLED', 'false'
buildConfigField 'boolean', 'IS_MAIL_DEBUG_ENABLED', 'true'
buildConfigField 'boolean', 'IS_MAIL_DEBUG_ENABLED', 'false'
buildConfigField 'boolean', 'IS_HTTP_LOG_ENABLED', 'true'
buildConfigField 'String', 'HTTP_LOG_LEVEL', "\"BODY\""
buildConfigField 'String', 'ATTESTER_URL', "\"https://localhost:1212/\""
Expand Down Expand Up @@ -422,6 +422,7 @@ dependencies {
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2'
implementation 'org.jsoup:jsoup:1.14.3'
implementation 'com.sandinh:zbase32-commons-codec_2.12:1.0.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'

implementation ('org.pgpainless:pgpainless-core:0.2.19') {
// exclude group: 'org.bouncycastle' because we will specify it manually
Expand Down
Loading