Commit graph

7714 commits

Author SHA1 Message Date
cketti
53961b0f73 Upgrade to Mockito 2 2018-04-16 04:28:44 +02:00
Vincent Breitmoser
0c6209447c
Merge pull request #3319 from k9mail/encrypted-subject-setting
Encrypted subject setting
2018-04-16 01:03:30 +02:00
Vincent Breitmoser
1a8aa0e4e8
Merge pull request #3321 from k9mail/move_to_settings
Move "About" and "Change Log" from Accounts to Settings screen
2018-04-11 17:50:36 +02:00
cketti
b97da796b8 Move "About" and "Change Log" from Accounts to Settings screen 2018-04-11 14:02:00 +02:00
Vincent Breitmoser
5bc61258d1 Encrypt subject only if setting is enabled 2018-04-09 20:05:16 +02:00
Vincent Breitmoser
82f6f881ee Add setting for subject encryption 2018-04-09 20:05:16 +02:00
Vincent Breitmoser
b004196bc6
Merge pull request #3309 from k9mail/encrypted-subject
Encrypted subjects using protected-headers=v1
2018-04-09 19:28:18 +02:00
cketti
2aa4041b31
Merge pull request #3315 from k9mail/GH-3138_allow_td_background_attribute
Allow "background" attribute for tags <tr>, <th>, and <td>
2018-04-08 21:35:13 +02:00
cketti
9cad669af8 Allow "background" attribute for tags <tr>, <th>, and <td> 2018-04-08 17:26:21 +02:00
Vincent Breitmoser
de4bcce96a Don't display parts of type text/rfc822-headers 2018-04-06 23:46:06 +02:00
Vincent Breitmoser
521647aefb Use protected-headers to encrypt subject 2018-04-06 15:31:56 +02:00
Vincent Breitmoser
b9ce92fc94 Use encrypted subject in replies and forwarded mail 2018-04-06 15:31:56 +02:00
Vincent Breitmoser
2d76e0172f Display encrypted subjects in message view 2018-04-06 15:31:56 +02:00
Vincent Breitmoser
a0565ab784 Extract encrypted subject in MessageViewInfoExtractor 2018-04-06 15:31:56 +02:00
Vincent Breitmoser
bcbafa1dc6 Remove remnant overrideCryptoWarning state 2018-04-06 15:31:49 +02:00
cketti
fd07e1a226
Merge pull request #3299 from k9mail/autocrypt-reply-encrypted
More correct Autocrypt encrypted replies
2018-04-06 00:19:15 +02:00
cketti
740d67a0f3
Merge pull request #3297 from k9mail/account-e2e-improved
Account e2e improved
2018-04-06 00:09:53 +02:00
Michał Nowak
d7873eb28d Add \Draft flag to draft messages (#3291)
Use \Draft flag for drafts
2018-04-05 12:01:54 +02:00
cketti
beff01a872 Update to Kotlin 1.2.31 2018-04-05 01:37:41 +02:00
Vincent Breitmoser
ff5af37647 Merge branch 'hendrikbl-settings-icons' 2018-04-04 15:14:55 +02:00
Hendrik
d0b3401c52 Added icons to preference list items 2018-04-04 15:14:43 +02:00
Vincent Breitmoser
ead701ec91 Use Timber instead of Log 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
ff8a6f0100 Don't care if we get UI_REQUIRED state
GET_SIGN_KEY_ID is a valid call without registration in newer
OpenKeychain. For older versions, it doesn't matter since we
get the registration dialog in a pending intent that will be
called as usual.
2018-04-04 14:06:51 +02:00
Vincent Breitmoser
f0c438e2d4 Cache activity result if provider isn't ready yet 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
ec4e704c32 clear openpgp key when provider is disabled 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
f67daa030d Call setupCryptoSettings during onCreate, too
This is slightly wasteful since it's also called in onResume, but we
need to make sure it's been called before onActivityResult. Moving to
onStart won't work, because we do want to refresh onResume if returning
from a dialog.
2018-04-04 14:06:51 +02:00
Vincent Breitmoser
6bf860af7d Support key selection info mechanism 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
764a98db32 don't save state individually for OpenPgpKeyPreference 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
8472d64731 Fix read of incorrect value while parceling 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
ccf98177e5 use OpenPgpApiManager to handle service connection in OpenPgpKeyPreference 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
35a8b6cd49 make K9PreferenceActivity implement LifecycleOwner 2018-04-04 14:06:51 +02:00
Vincent Breitmoser
db7db4dc47
Merge pull request #3301 from k9mail/fix-empty-moveOrCopy
Fix empty move or copy
2018-04-04 04:00:27 +02:00
Vincent Breitmoser
f3f65846d5 add unit test for empty pendingMoveOrCopy 2018-04-04 03:53:17 +02:00
Vincent Breitmoser
108391f977 Fix IllegalArgumentException on empty pendingMoveOrCopy
Fixes #3300
2018-04-04 03:32:52 +02:00
Vincent Breitmoser
b5f2935a08 Further simplify logic, and fix menu behavior 2018-04-03 21:56:42 +02:00
Vincent Breitmoser
495798b05a Simplify CryptoStatusDisplayType 2018-04-03 21:56:42 +02:00
Vincent Breitmoser
00cd3571f0 Use correct logic for encryption button when replying to encrypted mail 2018-04-03 17:49:01 +02:00
cketti
23d7697fa6
Merge pull request #3290 from k9mail/openpgp-api-manager
Introduce lifecycle-based OpenpgpApiManager for service connection
2018-04-03 05:35:34 +02:00
Vincent Breitmoser
e4aa00d8a7 Make OpenPgpApiManager more testable, and fix related unit tests 2018-04-02 17:42:03 +02:00
Vincent Breitmoser
0c2f9bfb31 Slight improvements to OpenPgp api connection state handling 2018-04-02 17:36:39 +02:00
Vincent Breitmoser
fedf35815f Redo handling of user interaction pending intent 2018-04-01 13:49:28 +02:00
Vincent Breitmoser
ee16a83ec8 move OpenPgpApiManager into openpgp-api lib 2018-04-01 13:49:28 +02:00
Vincent Breitmoser
6d78f6fe31 extract OpenPgpApi into OpenPgpApiManager 2018-04-01 13:49:28 +02:00
cketti
a14d0b0bc5
Merge pull request #3276 from k9mail/account-e2e-setting
Revamp e2e settings
2018-04-01 02:44:56 +02:00
Vincent Breitmoser
7f5d852b6d add note about missing openPgpProvider setting 2018-03-30 12:35:59 +02:00
Vincent Breitmoser
188de17276 Dismiss activity when clicking outside of dialog 2018-03-30 12:35:14 +02:00
Vincent Breitmoser
56ffd807de Make e2e key setting actually work 2018-03-30 12:35:14 +02:00
Vincent Breitmoser
ac5946df30 Use null for empty pgp provider, use account's check method 2018-03-30 12:35:14 +02:00
Vincent Breitmoser
860f90d499 incorporate feedback 2018-03-30 12:35:14 +02:00
Vincent Breitmoser
6cb5026a9f Rename method from temp name 2018-03-30 12:35:14 +02:00