Commit Graph

5646 Commits

Author SHA1 Message Date
cketti ba1fc1305f Merge branch 'master' into pgp_mime_preparations 2015-02-14 05:10:15 +01:00
cketti 9c3cab2354 Don't show changelog dialog during UI tests
This will hopefully make the UI tests more stable.
2015-02-14 04:23:54 +01:00
cketti 8d510e96a9 Merge pull request #543 from gburca/master
Fixes issue 6703
2015-02-13 18:48:59 +01:00
qvandekadsye 5013f36ba4 re-correcting String glitch by changing layout-height attribute 2015-02-13 15:21:09 +01:00
Gabriel Burca 9ba2725ab1 Fixes issue 6703
- onPrepareActionMode must be called before computeBatchDirection
  because computeBatchDirection ends up referencing mMarkAsRead /
  mMarkAsUnread and mFlag / mUnflag which could be null otherwise.
2015-02-12 21:27:44 -06:00
cketti e0abcc3f67 Decouple MessageCryptoHelper from MessageList 2015-02-09 20:02:16 +01:00
cketti 5d3cdc2724 Remove unused variable 2015-02-09 19:44:33 +01:00
cketti bb3f84fda6 Move MessageCryptoAnnotations to upper level 2015-02-09 19:43:23 +01:00
cketti d301efea58 Move MessageCryptoHelper 2015-02-09 19:37:46 +01:00
cketti 3a527cbcf6 Decouple MessageCryptoHelper from MessageViewFragment 2015-02-09 19:35:53 +01:00
cketti 948cb971ad Rename method
Since the crypto code no longer lives in MessageViewFragment it shouldn't
make references to what happens after its work is done.
2015-02-09 19:05:56 +01:00
cketti 5c036e2991 Simplify control flow 2015-02-09 19:05:45 +01:00
cketti 26eb1f52e5 Don't attempt to verify/decrypt if no crypto provider is configured 2015-02-06 23:26:46 +01:00
cketti b515e947cf Fix typo 2015-02-06 23:12:26 +01:00
cketti ee1180e34c Use Part from MessageViewContainer for K9WebViewClient
Now K9WebViewClient can find encrypted attachments referenced by Content-ID.
2015-02-06 20:11:58 +01:00
cketti cadac6dd89 Add reference to root part to MessageViewContainer 2015-02-06 20:04:03 +01:00
cketti 49c4115e46 Refactor code; no functional changes 2015-02-06 20:01:14 +01:00
cketti 3377e50352 Fix code style 2015-02-06 19:57:30 +01:00
cketti fce12b2450 Remove unused constructor 2015-02-06 19:53:39 +01:00
cketti 1a20ca06f1 Handle "cid:" URIs in HTML message body 2015-02-06 18:31:26 +01:00
cketti 80221dace8 Mark DownloadImageTask as deprecated 2015-02-04 21:43:45 +01:00
cketti 1f27897679 Extract methods to make code more readable 2015-02-04 21:42:09 +01:00
cketti 5175ff9df4 Extract method 2015-02-04 21:17:54 +01:00
cketti 9814442de4 Extract constant for default file name 2015-02-04 21:16:08 +01:00
cketti 36abde2c0b Extract method 2015-02-04 21:14:04 +01:00
cketti 937ca7e17a Move inner class DownloadImageTask to upper level 2015-02-04 21:07:54 +01:00
cketti d7da286098 Remove unused imports 2015-02-04 21:03:25 +01:00
cketti 0241001c63 Display attachment size for decrypted parts 2015-02-01 05:41:40 +01:00
cketti 19db6c703b Don't display -1 as attachment size 2015-02-01 04:24:02 +01:00
cketti 474efa1831 Fix NullPointerExceptions introduced by conditionally inflating the crypto layout 2015-02-01 00:21:52 +01:00
Vincent Breitmoser dc8fd39c7e move crypto data into an annotation structure, and fix pgp/inline
note that we currently lack proper confirmation about whether data was
actually decrypted or not, so for now we always assume it wasn't
2015-01-30 16:16:11 +01:00
Vincent Breitmoser 4bec165fdc preliminary support for pgp/inline 2015-01-30 16:11:57 +01:00
cketti de8da4dab4 Write decrypted bodies to temporary files
Use FileProvider to be able to open decrypted attachments
2015-01-30 14:27:33 +01:00
Vincent Breitmoser e8c591e6be ignore application/pgp-signature parts for display 2015-01-30 13:19:53 +01:00
Vincent Breitmoser 0374dc9cb1 display pendingIntent button when there is a pendingIntent only 2015-01-30 11:30:36 +01:00
Vincent Breitmoser a0b4faf688 pass OpenPgpError to display, delete old layout 2015-01-30 10:55:06 +01:00
Vincent Breitmoser d57f6c0ed5 buffer data after decryption before mime parsing 2015-01-30 10:34:46 +01:00
cketti 7158abe7ff Use same version of build tools we use in main project 2015-01-30 10:28:14 +01:00
Dominik Schürmann a00a119e18 Update OpenPGP API lib to newest version 2015-01-29 20:53:25 +01:00
Vincent Breitmoser 3077e6a2d7 close piped streams after use 2015-01-29 20:24:59 +01:00
cketti 0a07250417 Fix class name 2015-01-29 20:07:30 +01:00
Vincent Breitmoser d678ccc160 extract crypto methods from MessageViewFragment into MessageCryptoHelper 2015-01-29 20:00:28 +01:00
Vincent Breitmoser 00b7b74878 pass pendingIntent, and some refactoring 2015-01-29 19:27:48 +01:00
Vincent Breitmoser 712acf4481 early support for detached signatures 2015-01-29 19:01:44 +01:00
cketti 38d3564c57 Merge pull request #537 2015-01-29 17:48:28 +01:00
cketti 41ac5a9fed Fix indentation 2015-01-29 17:47:37 +01:00
cketti edf75a32d8 Fix LocalMessageExtractorTest 2015-01-29 17:41:46 +01:00
cketti 8627e65cab Merge pull request #536 from ligi/ligi/refactor/pgp_utils
Test & refactor OpenPgpUtils
2015-01-29 17:32:59 +01:00
cketti fed15a01e5 Merge branch 'store_decryption_result' into pgp_mime_preparations
Conflicts:
	k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
2015-01-29 16:43:50 +01:00
ligi 033c1502db Reduce LOC even more 2015-01-29 16:43:45 +01:00