ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,174 Commits 2 Branches 0 Tags 45 MiB
7ae1a977d3
Commit Graph

10174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d1b549dc14 Import translations. DO NOT MERGE 
Change-Id: Ie565f9a9be1a75e2afda530a48c03875e4c151f7
Auto-generated-cl: translation import
 2014-05-29 19:45:22 -07:00
Martin Hibdon
13d3a42d94 am 636a20a7: Bump version number 
* commit '636a20a7276fd28f1ac682d10bf343161a1c5bc6':
  Bump version number
 2014-05-29 20:42:58 +00:00
Martin Hibdon
636a20a727 Bump version number 
Change-Id: I2831b14d1e6a612f05caf285aaa1253e757f0890
 2014-05-29 13:40:37 -07:00
Andrew Sapperstein
970b4b7eb2 am 4e6aa252: Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev 
* commit '4e6aa25286d9971e9574d5e3470ad99a15cf93ce':
  Support hooks for new contact photo source.
 2014-05-28 19:41:13 +00:00
Andrew Sapperstein
4e6aa25286 Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev 2014-05-28 19:38:41 +00:00
Jay Shrauner
f3440d33a9 Fix NPE in setAccountPolicy 
Check for null returned by Account.restoreAccountWithId as with other places
where it is called.

Bug:15286267
Change-Id: I56d59564a1fa814f5c52b44c12303014eea2b0b0
 2014-05-27 14:05:56 -07:00
Tony Mantler
4ce1fc7669 Disambiguate settings intents 
b/13325901

Change-Id: I2843a6bfdac4acbabc758ddc44f1d980b7036aef
 2014-05-22 14:31:22 -07:00
Tony Mantler
8b801e915c Fix AOSP Email compile 
Change-Id: Ic894b2c0534e09bf42662c49855fda39967958eb
 2014-05-22 13:16:38 -07:00
Martin Hibdon
92a059ece4 Merge "Revert "Get rid of deleteAccountPIMData from IEmailService"" into ub-mail-master 2014-05-21 20:43:10 +00:00
Martin Hibdon
c5f5a14ae9 Revert "Get rid of deleteAccountPIMData from IEmailService" 
This reverts commit cf2178c4fa.

Change-Id: I9b05dd7a29a2d2edf64529ca28e2305737a43115
 2014-05-21 20:41:37 +00:00
Martin Hibdon
9598c1e817 Merge "Get rid of deleteAccountPIMData from IEmailService" into ub-mail-master 2014-05-21 20:31:08 +00:00
James Lemieux
332f544991 Merge "Sanitize HTML email bodies in Android Email" into ub-mail-master 2014-05-21 20:12:06 +00:00
Martin Hibdon
cf2178c4fa Get rid of deleteAccountPIMData from IEmailService 
This doesn't need to be part of the service because the
implementation doesn't need to be different between any
of the different protocols.

Change-Id: Ifddf16dd3ccaf397029f08f6d4283d9a5630f717
 2014-05-21 12:18:29 -07:00
Tony Mantler
44d3500f7a Merge "Remove unused constant" into ub-mail-master 2014-05-21 17:53:04 +00:00
Tony Mantler
5021265826 Merge "Test encode/decode of attachments" into ub-mail-master 2014-05-21 17:48:53 +00:00
Tony Mantler
4abb30384f Remove unused constant 
b/15133133

Change-Id: Ia89829e796dadf48f0257adb994c7102b7d30baf
 2014-05-21 10:33:15 -07:00
Tony Mantler
5a93b8f7c6 Test encode/decode of attachments 
b/15089448

Change-Id: Ifd2afcfb36c9820c5d64ebbcc3230603b2a27089
 2014-05-21 10:25:08 -07:00
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
Anthony Lee
9768a05376 Merge "Factored out Watchdog code and cleaned up other stuff." into ub-mail-master 2014-05-20 22:41:16 +00:00
Anthony Lee
a72a12241f Factored out Watchdog code and cleaned up other stuff. 
Moved testing code to the bottom of the file. The next CL
should be the removal of the DownloadSet. Also fixed b/15003801,
so that the test will not fail.

Change-Id: Ie8320782d6b292d5a367af95d7c58d70a4213ead
 2014-05-20 15:11:03 -07:00
Andrew Sapperstein
6c31d220a8 Support hooks for new contact photo source. 
b/11387812

Change-Id: If081d58941dca0a330905dc2d80148df336995d5
 2014-05-20 14:40:08 -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