Skip to content

Commit 20cd64b

Browse files
authored
issues #1188 #1539 #1540 #1541 #1542 #1566 #1570 support multiple pub keys per recipient (#1523)
* Added PublicKeyEntity. Refactored code. WIP.| #1188 * Fixed using ContactsDao.getAllContactsWithPgpLD().| #1188 * Fixed using ContactsDao.getAllContactsWithPgp()/getAllContactsWithPgpWhichMatched().| #1188 * Renamed ContactEntity to RecipientEntity.| #1188 * Renamed ContactsDao to RecipientDao.| #1188 * Refactored code.| #1188 * Renamed ContactsViewModel to RecipientsViewModel.| #1188 * Fixed a few methods in RecipientDao. Refactored code.| #1188 * Fixed RecipientDao.getRecipientByEmail().| #1188 * Fixed some moments with adding/updating a recipient with a pub key.| #1188 * Made a workable version after switching to use 'recipients' and 'pub_keys' tables.| #1188 * Fixed tests. Refactored code.| #1188 * Modified code to use a new logic to save contacts on the compose screen.| #1539 * Modified code to use a new logic to apply colors to recipients(chips).| #1540 * Added changes to use all recipient's pub keys for ecnryption + use all sender's mathing pub keys.| #1541 * Fixed signing option.| #1541 * Import recipients manually. Refactored code. Added LookUpPubKeysDialogFragment and ImportRecipientsFromSourceFragment..| #1542 * Added a base realization of importing pub keys manually.| #1542 * Added ImportAllPubKeysFromSourceDialogFragment.| #1542 * Removed unused source.| #1542 * Improved some classes.| #1566 * Added RecipientDetailsFragment.| #1566 * Fixed opening PublicKeyDetailsFragment. Refactored code.| #1566 * Fixed exporting pub key.| #1566 * Fixed deleting pub key.| #1566 * Fixed editing pub key.| #1566 * Fixed database migration bug.| #1188 * Fixed nav_graph.xml for test.| #1188 * Temporary disabled some tests.| #1188 * Temporary disabled some tests(step 2).| #1188 * Fixed Junit tests.| #1188 * Fixed some UI tests.| #1188 * Fixed merge conflicts.| #1188 * Fixed some PR comments. Refactored code.| #1188 * Fixed some PR comments. Refactored code. Step 2.| #1188 * Restored some code.| #1188 * Renamed a file.| #1188 * Fixed importing/updating pub keys for PublicKeyMsgBlock.| #1188
1 parent 48ec0e1 commit 20cd64b

116 files changed

Lines changed: 5310 additions & 3407 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

FlowCrypt/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ android {
164164
devTest {
165165
versionNameSuffix "_devTest"
166166
buildConfigField 'boolean', 'IS_ACRA_ENABLED', 'false'
167-
buildConfigField 'boolean', 'IS_MAIL_DEBUG_ENABLED', 'true'
167+
buildConfigField 'boolean', 'IS_MAIL_DEBUG_ENABLED', 'false'
168168
buildConfigField 'boolean', 'IS_HTTP_LOG_ENABLED', 'true'
169169
buildConfigField 'String', 'HTTP_LOG_LEVEL', "\"BODY\""
170170
buildConfigField 'String', 'ATTESTER_URL', "\"https://localhost:1212/\""
@@ -422,6 +422,7 @@ dependencies {
422422
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2'
423423
implementation 'org.jsoup:jsoup:1.14.3'
424424
implementation 'com.sandinh:zbase32-commons-codec_2.12:1.0.0'
425+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
425426

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

0 commit comments

Comments
 (0)