James Lemieux
837aba39d5
Sanitize HTML email bodies in Android Email
...
b/14567151
Sanitizes HTML email bodies on demand as they are requested from
EmailMessageCursor. Also alters Account settings to indicate that emails can be
assumed to be sanitized and transform scripts can be applied to the email
bodies.
Change-Id: I789e6de3569ae8c7d2c21f0b5aa590d7638a1467
2014-05-20 16:26:58 -07:00
Tony Mantler
c0ab393308
am ee818ac8
: Add missing space in MIME header
...
* commit 'ee818ac89862d67a645131d3077f3a9556423ec2':
Add missing space in MIME header
2014-05-20 18:42:14 +00:00
Tony Mantler
ee818ac898
Add missing space in MIME header
...
Also skip adding the filename if none exists
b/13138456
Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
(cherry picked from commit 8b80821645
)
2014-05-20 18:16:41 +00:00
Tony Mantler
2fbd8c269c
Merge "Add missing space in MIME header" into ub-mail-master
2014-05-19 22:10:18 +00:00
Tony Mantler
8b80821645
Add missing space in MIME header
...
Also skip adding the filename if none exists
b/13138456
Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
2014-05-19 15:05:07 -07:00
Martin Hibdon
6e7a92ad68
am 5c5ed8f1
: Merge "Bump version number" into ub-mail-algol
...
* commit '5c5ed8f14a341444bdef6764338450023b48bc3a':
Bump version number
2014-05-19 21:49:07 +00:00
Tony Mantler
7da60fe49c
am 9a44073e
: Fix the remainder of save-alert cases
...
* commit '9a44073e75027b191dec209ade0ae4988e48b4ca':
Fix the remainder of save-alert cases
2014-05-19 21:45:56 +00:00
Martin Hibdon
5c5ed8f14a
Merge "Bump version number" into ub-mail-algol
2014-05-19 21:45:54 +00:00
Martin Hibdon
7aa399bc37
Bump version number
...
Change-Id: Icf8cb5db2a8da6c99d5cbf458b4a22dfe6ec45e1
2014-05-19 14:42:41 -07:00
Tony Mantler
9a44073e75
Fix the remainder of save-alert cases
...
b/14969455
Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
(cherry picked from commit 28dd431c23
)
2014-05-19 21:41:13 +00:00
Jin Cao
81ff6fae02
am cd4a94b7
: Dependent change caused by refactor of FolderSelectors
...
* commit 'cd4a94b7e1ff89961c422682d562149744dac0e7':
Dependent change caused by refactor of FolderSelectors
2014-05-19 21:26:54 +00:00
Jin Cao
cd4a94b7e1
Dependent change caused by refactor of FolderSelectors
...
b/9174917
Change-Id: I1d644fe52b3b3e0c3428c6007d4c591a87a45e6c
2014-05-19 12:41:00 -07:00
Baligh Uddin
488b061b3a
am ed6e6cc2
: (-s ours) am cbbb6e19
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ed6e6cc27414827867bf2c6f5df745a9ee032f27':
Import translations. DO NOT MERGE
2014-05-16 23:19:26 +00:00
Baligh Uddin
ed6e6cc274
am cbbb6e19
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cbbb6e1901a3390aadab10d26d2065164b0ef914':
Import translations. DO NOT MERGE
2014-05-16 23:14:54 +00:00
Baligh Uddin
cbbb6e1901
Import translations. DO NOT MERGE
...
Change-Id: I5a9f397fdd8d2dc4267988f9c97097f9ad380bad
Auto-generated-cl: translation import
2014-05-16 16:03:34 -07:00
Tony Mantler
e073f5a02e
Merge "Add test for HostAuth parceling" into ub-mail-master
2014-05-16 18:35:35 +00:00
Tony Mantler
9b8dafe23a
Add test for HostAuth parceling
...
b/14998526
Change-Id: Ic92424f6f2fc2eec261e2ce91158cc396eb24ffc
2014-05-15 23:24:05 +00:00
Tony Mantler
28dd431c23
Fix the remainder of save-alert cases
...
b/14969455
Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
2014-05-15 14:58:54 -07:00
Martin Hibdon
4461f1d99e
am 4b5b7886
: Merge "Disable the debug menu" into ub-mail-algol
...
* commit '4b5b7886bc91c27688387ae00e552ad8540eb3e7':
Disable the debug menu
2014-05-15 20:42:34 +00:00
Martin Hibdon
4b5b7886bc
Merge "Disable the debug menu" into ub-mail-algol
2014-05-15 20:41:25 +00:00
Martin Hibdon
2c26bb3b09
Disable the debug menu
...
b/14995079
Change-Id: I0b7fa2edc7cf7cdac97aba9412a18aece09cb5c2
2014-05-15 13:35:33 -07:00
Martin Hibdon
236d84c7c0
am 5df6ff13
: Bump the version number
...
* commit '5df6ff137db2aea394076991b9bc9d1ef641d82d':
Bump the version number
2014-05-15 17:47:25 +00:00
Martin Hibdon
5df6ff137d
Bump the version number
...
Change-Id: I24a7a30acee4879de6e69b72e4ae7d6ddbc22bb6
2014-05-15 10:42:41 -07:00
Tony Mantler
10cd5263c5
am 0cb5fd3f
: (-s ours) DO NOT MERGE Fix URI comparison
...
* commit '0cb5fd3f7fa13b15d61cf7cc75711596da72a333':
DO NOT MERGE Fix URI comparison
2014-05-15 16:45:07 +00:00
Tony Mantler
c1265d2090
Merge "Move email bodies to files" into ub-mail-master
2014-05-15 16:43:00 +00:00
Tony Mantler
018ff4b464
Merge "Fix FLAG_OAUTH usage" into ub-mail-master
2014-05-15 16:42:41 +00:00
Baligh Uddin
e0e29edb04
am c2dbe230
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c2dbe230abbca7f32923fc60525d0edc95c9b2d8':
Import translations. DO NOT MERGE
2014-05-15 14:32:28 +00:00
Baligh Uddin
c2dbe230ab
Import translations. DO NOT MERGE
...
Change-Id: Ie366636ee837a1f4e8617135a2aedc274913023a
Auto-generated-cl: translation import
2014-05-14 18:09:52 -07:00
Tony Mantler
0cb5fd3f7f
DO NOT MERGE Fix URI comparison
...
b/14914981
The framework may make copies of the URI objects before they're passed in,
so we should use .equals() instead of pointer equality.
Change-Id: Ia443e96c81d53829ac6cfce70cebc098861f1c78
(cherry picked from commit e8a3c14f28
)
2014-05-14 23:36:31 +00:00
Tony Mantler
34c2e1619d
Fix FLAG_OAUTH usage
...
Also fix some excessive checking of incoming/outgoing settings fragments
b/14969455 b/14971192
Change-Id: I6cf83aa59d381d3bbfc33e0d4a6e133c1814ba69
2014-05-14 16:31:04 -07:00
James Lemieux
b3db04b80b
Stop EmailProvider from zealously and uselessly notifying of changes
...
EmailConversationCursor eagerly marks all messages in the current mailbox
as being seen. Most of the time it is a redundant operation, but nothing
prevents the provider from broadcasting notifications and all of the
observers from dutifully reacting to the notification. A good deal of
work is avoided now that we only notify when rows in our database have
actually been altered.
Change-Id: Ie91e6aebaf9c2899510f3818586d582073954d16
2014-05-14 15:38:35 -07:00
Tony Mantler
82a207132b
Move account backup/restore to userdata in AccountManager
...
Change-Id: Iea9f2a1b1f2d87e07d63cbb1df5a0d6355ea4031
2014-05-14 15:15:49 -07:00
Tony Mantler
7525feb244
Move email bodies to files
...
Change-Id: Icfd0c4ab2ad25cc02b45cf41e7a205c17948ef2c
2014-05-14 13:27:49 -07:00
Tony Mantler
97ddf6e5fa
Merge "Fix URI comparison" into ub-mail-master
2014-05-14 18:34:33 +00:00
Tony Mantler
e8a3c14f28
Fix URI comparison
...
b/14914981
The framework may make copies of the URI objects before they're passed in,
so we should use .equals() instead of pointer equality.
Change-Id: Ia443e96c81d53829ac6cfce70cebc098861f1c78
2014-05-14 11:32:20 -07:00
Tony Mantler
65e64c65b5
Merge "Fix projection columns, begin removing another unused field" into ub-mail-master
2014-05-13 22:45:25 +00:00
Tony Mantler
8518665a04
Fix projection columns, begin removing another unused field
...
Change-Id: I89126dba47ed6e78c870d458c4f286a37f763a66
2014-05-13 15:41:39 -07:00
Anthony Lee
825aa02a6f
Merge "Introduction of DownloadQueue and associated tests." into ub-mail-master
2014-05-13 18:28:28 +00:00
Tony Mantler
2f97a7c658
Clean up unused code and warnings in Account
...
Change-Id: I40475eb6c8afa6b7b28fd143b9ad4fd268ff4657
2014-05-13 10:46:30 -07:00
Baligh Uddin
f1cf4f29de
am 1cf672ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1cf672eafd94262c3e9cc08a5d5e99b31d47001d':
Import translations. DO NOT MERGE
2014-05-13 16:03:03 +00:00
Baligh Uddin
56ef888532
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-05-13 15:59:49 +00:00
Anthony Lee
0e49862711
Introduction of DownloadQueue and associated tests.
...
Also a bit of cleanup around log tags and DownloadRequest.
Change-Id: I33221f099ed691e5258e1741cf0a63381404f520
2014-05-12 13:50:50 -07:00
Baligh Uddin
f4155cc0a8
Import translations. DO NOT MERGE
...
Change-Id: I66c8a1d091bdc2ca7c4b9d967e0a03dc6efcf35d
Auto-generated-cl: translation import
2014-05-12 13:26:55 -07:00
Baligh Uddin
1cf672eafd
Import translations. DO NOT MERGE
...
Change-Id: If70ec53e84a062cc11b4d967c182fecf1f0d19bd
Auto-generated-cl: translation import
2014-05-12 13:25:19 -07:00
Anthony Lee
bca4f9fcfb
Service intent's package matches the content provider's.
...
b/14596165. When setting the package of the service intent,
query the app that implements the Email content authority since
that is the same app that should handle the intent.
Change-Id: I29a34a056516edda78acb83b9c89547ca0dc5ca1
2014-05-11 00:47:44 -07:00
Tony Mantler
d222c6b817
Merge "Fetch email bodies using ContentResolver#openInputStream" into ub-mail-master
2014-05-09 17:50:04 +00:00
Tony Mantler
2f288864b6
Fetch email bodies using ContentResolver#openInputStream
...
This brings us further along the path to storing email bodies
outside of the database.
Change-Id: I96296114ade0d561df724878ed92999306bcd176
2014-05-08 15:50:57 -07:00
Tony Mantler
2965d6ec31
am 8989dfa5
: Fix cancel handling in account settings screens
...
* commit '8989dfa5e7213a42362b3bbdf865b46dab5a5012':
Fix cancel handling in account settings screens
2014-05-08 21:32:21 +00:00
Tony Mantler
8989dfa5e7
Fix cancel handling in account settings screens
...
- Don't loop on the confirmation dialog
- Do a deep copy of the initial hostauth state
- Save the initial hostauth state on configuration changes
- Collect the user input before comparing the old state with the new
b/14285245
Change-Id: Ibc033fac525be2a4cb03c6a0d1e92254a2236b4c
(cherry picked from commit 294593c5f5
)
2014-05-08 21:27:23 +00:00
Baligh Uddin
7366516bb0
am 92fdb3d3
: (-s ours) Import translations. DO NOT MERGE
...
* commit '92fdb3d39a9385238a55753b8e0c8ff7a461d420':
Import translations. DO NOT MERGE
2014-05-08 14:51:59 +00:00