Commit Graph

12332 Commits

Author SHA1 Message Date
Anthony Lee
0132856e67 Changed the IEmailService interface to accept and accountId in
the loadAttachment() call. This work was necessary to support
the new EasService & EasOperation infrastructure.

Change-Id: Idd507aec999596ccd4afa5f03ff2b3c2e38a9029
(cherry picked from commit efac8255ed75d22e60036e19e7a95f8407d18ad3)
2014-03-03 19:25:38 +00:00
Yu Ping Hu
3e8ff1a647 Add pushModify to IEmailService.
This call lets the service know that the push settings for an
account have changed.

Change-Id: I7ed41853df6af6762c80283a2a3510ce41551657
(cherry picked from commit 446136a2278652c627068ecddff534de1ad431ab)
2014-02-28 01:41:22 +00:00
The Android Automerger
cb408cec8b merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-02-27 16:52:27 -08:00
The Android Automerger
2614aa24eb merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-02-27 16:44:14 -08:00
Jerry Xie
c8ed785761 Get Email units to compile in mr2 branch
Change-Id: I471a47f21ce75daf82f0a09b071119f995a76778
2014-02-27 15:04:34 -08:00
Jerry Xie
89b8fdca18 Disable, suppress, remove broken and obsolete Email tests
Change-Id: Ia4dcba1c6966f23dd2a15e69324b7345aed8f944
(cherry picked from commit 7037a0bd3d)
2014-02-27 20:29:11 +00:00
Jerry Xie
475a7626fb Add makefile for EmailTests
Change-Id: Ic441b5cea9efd0b714a00a69c5b8483ddd11fafa
(cherry picked from commit d241290f0b)
2014-02-27 20:26:08 +00:00
Jerry Xie
515d830e87 Get Email units to compile
Change-Id: I171a0e2421c5006d9862ad94f886932146547020
(cherry picked from commit 17d3a29c9d)
2014-02-27 20:23:38 +00:00
Tony Mantler
39d63b746c Merge "Fix sync window preference being added multiple times" into ub-mail-master 2014-02-27 17:25:44 +00:00
Yu Ping Hu
d715e17b28 Delete unused functions from IEmailService.aidl.
Change-Id: I131d2d3436a50c94d664fc57c6514481d9afbc97

Conflicts:
	src/com/android/email/service/ImapService.java
2014-02-26 17:08:18 -08:00
Tony Mantler
9ef2c5f2cf Fix sync window preference being added multiple times
Also clean up potential NPE

b/13109860

Change-Id: I46bebd6af6329679af28b6b997cd33fca97376dd
2014-02-26 16:02:12 -08:00
Baligh Uddin
e41461c151 Import translations. DO NOT MERGE
Change-Id: I814417b33835cb75d196077b56c073514235a9c4
Auto-generated-cl: translation import
2014-02-26 13:11:12 -08:00
Baligh Uddin
c52d433f99 Import translations. DO NOT MERGE
Change-Id: Idd56836e92a0ae18eb94755e52c6982024c62b89
Auto-generated-cl: translation import
2014-02-26 13:09:45 -08:00
Tony Mantler
dde11440e1 Merge "Fix IMAP delete handling" into ub-mail-master 2014-02-26 00:40:30 +00:00
Baligh Uddin
7f6855864c Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-02-25 17:23:25 +00:00
Baligh Uddin
9beac5ce87 Import translations. DO NOT MERGE
Change-Id: Ida34fae1488c3d5a05b1e69e622f83252d810c42
Auto-generated-cl: translation import
2014-02-24 14:20:43 -08:00
Baligh Uddin
09cc30c353 Import translations. DO NOT MERGE
Change-Id: Ie3be0e260e3f4f4c0f631d453fa8585560281de4
Auto-generated-cl: translation import
2014-02-24 14:19:22 -08:00
Martin Hibdon
d9abcfa2be Merge "Update the title for the oauth authentication screen" into ub-mail-master 2014-02-24 19:17:14 +00:00
Tony Mantler
220dc1bf57 Fix IMAP delete handling
When a message is flagged as deleted on the server, but is not yet purged,
we'll see it syncing down with a deleted flag. This change treats that
condition as if the message has been fully deleted.

Also fix a copy/paste error for cleaning up the message modification tables.

b/12367845
b/13137235

Change-Id: Ic741dedc10251775a7afdce171d59efbd2cf1a5f
2014-02-24 10:19:05 -08:00
Tony Mantler
da2582c9f4 Merge "Quit dropping inline attachments on the floor" into ub-mail-master 2014-02-21 20:59:12 +00:00
Tony Mantler
c5685ba600 Fix tests
Change-Id: I89370919dd5a8a129ea946f2d3429f0d4a056eb6
2014-02-21 11:43:19 -08:00
Tony Mantler
16fea4dfc0 Quit dropping inline attachments on the floor
If we have image/* attachments with "Content-Disposition: inline" we would
fetch the images immediately, then drop them on the floor instead of saving
them to the DB.

Add code to catch these attachments and save them.

b/13132802

Change-Id: I5203bb1aa518aa46cdb3a38ead6f79af63b521ac
2014-02-21 11:16:29 -08:00
Brett Chabot
5f72d21df9 Add a placeholder flaky test.
For fun and profit.

Change-Id: Id9feb6bc89a66143f1220053fdf0e3fd25097229
2014-02-20 21:59:50 -08:00
Brett Chabot
695c77e526 Convert Email tests to use android-support-tests
Change-Id: I173afa352504757e84f5cc48dca8b493957ff6a1
2014-02-20 21:03:07 -08:00
Baligh Uddin
34767b5c54 am 5543a8a3: (-s ours) am 6bdadfeb: (-s ours) am 059d00bc: (-s ours) am aa5ceed1: (-s ours) am 7d5e2672: (-s ours) am 4f316960: (-s ours) Import translations. DO NOT MERGE
* commit '5543a8a3c3c6e8683cc9177b2bfd1672641a6123':
  Import translations. DO NOT MERGE
2014-02-21 04:26:21 +00:00
Martin Hibdon
ff3276a69d Update the title for the oauth authentication screen
Change-Id: I93300791551e199c47880773f2ea9301154cd077
2014-02-20 16:08:46 -08:00
Baligh Uddin
5543a8a3c3 am 6bdadfeb: (-s ours) am 059d00bc: (-s ours) am aa5ceed1: (-s ours) am 7d5e2672: (-s ours) am 4f316960: (-s ours) Import translations. DO NOT MERGE
* commit '6bdadfebe456e11d52fb818a75657ac1c785acf8':
  Import translations. DO NOT MERGE
2014-02-20 22:48:05 +00:00
Martin Hibdon
c02e3d5567 Merge "Fix temporary setup flow on tablets" into ub-mail-master 2014-02-20 22:45:50 +00:00
Baligh Uddin
6bdadfebe4 am 059d00bc: (-s ours) am aa5ceed1: (-s ours) am 7d5e2672: (-s ours) am 4f316960: (-s ours) Import translations. DO NOT MERGE
* commit '059d00bcaf6d5f42db1cb5d87515b989f4b0f09f':
  Import translations. DO NOT MERGE
2014-02-20 22:45:05 +00:00
Baligh Uddin
059d00bcaf am aa5ceed1: (-s ours) am 7d5e2672: (-s ours) am 4f316960: (-s ours) Import translations. DO NOT MERGE
* commit 'aa5ceed17daab67c422fb2387008590add5bb636':
  Import translations. DO NOT MERGE
2014-02-20 22:41:36 +00:00
Baligh Uddin
aa5ceed17d am 7d5e2672: (-s ours) am 4f316960: (-s ours) Import translations. DO NOT MERGE
* commit '7d5e2672cb7630698ac33456dca432f274b7fff0':
  Import translations. DO NOT MERGE
2014-02-20 22:36:04 +00:00
Martin Hibdon
ae0143e489 Fix temporary setup flow on tablets
b/13105763

Change-Id: I63f6956afbbaceadfc1a77701c6f256705601c09
2014-02-20 14:32:22 -08:00
Baligh Uddin
7d5e2672cb am 4f316960: (-s ours) Import translations. DO NOT MERGE
* commit '4f3169609f7cee4cae43496c12913ee6074a35f8':
  Import translations. DO NOT MERGE
2014-02-20 21:20:14 +00:00
Baligh Uddin
7e1dc278c7 am ecbdb2e3: (-s ours) Import translations. DO NOT MERGE
* commit 'ecbdb2e39070ddd20f759f1ca41c0222e01db10e':
  Import translations. DO NOT MERGE
2014-02-20 21:18:31 +00:00
Baligh Uddin
09ac61a1ca am eebefdbc: (-s ours) Import translations. DO NOT MERGE
* commit 'eebefdbc2fd08441cf4235ee0a940fc76375e2f0':
  Import translations. DO NOT MERGE
2014-02-20 13:18:12 -08:00
Baligh Uddin
ab74aa6ce2 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-02-20 21:16:39 +00:00
Baligh Uddin
cad590c9a4 Import translations. DO NOT MERGE
Change-Id: I10e59f47be32dbf3ff8d301c03751f6ef5d355e8
Auto-generated-cl: translation import
2014-02-20 11:23:04 -08:00
Baligh Uddin
ecbdb2e390 Import translations. DO NOT MERGE
Change-Id: I8524ae21a5965ca5188e8190e40b6c1ec553583c
Auto-generated-cl: translation import
2014-02-20 11:18:49 -08:00
Baligh Uddin
4f3169609f Import translations. DO NOT MERGE
Change-Id: I05de15eb4b05b3f6abf689be218248a4f232f55e
Auto-generated-cl: translation import
2014-02-20 11:11:36 -08:00
Baligh Uddin
eebefdbc2f Import translations. DO NOT MERGE
Change-Id: I6783f200c9b6f1e152f96ac998e720707b39891d
Auto-generated-cl: translation import
2014-02-20 11:07:40 -08:00
Jerry Xie
3555dc03bf Add @SmallTest annotation to test classes so they get run in continuous
Change-Id: Ieb0e3af146a6668c813ff16a718221eae61e8e01
2014-02-19 20:13:59 -08:00
Martin Hibdon
aab398522a Merge "Fix some broken tests" into ub-mail-master 2014-02-20 00:27:42 +00:00
Martin Hibdon
10c7412555 Fix some broken tests
b/13085182
You can't look up emailServiceInfo for smtp, we don't store that
in services.xml. The thing is, if we're using outgoing settings,
we're always using smtp, which allows oauth.

Change-Id: I5c6032e8d5020ba83fa1c803666b83f134f87f75
2014-02-19 16:17:43 -08:00
Tony Mantler
6c241b9738 Merge "Fix unbounded async task creation in ADS" into ub-mail-master 2014-02-19 19:35:01 +00:00
Martin Hibdon
56b7ef3c0d Merge "Update version number" into ub-mail-master 2014-02-19 18:03:01 +00:00
Martin Hibdon
6864d7e1a9 Update version number
Change-Id: I17500d6f570bb0ebb0fe6cb7d955883cc1e2ceb8
2014-02-19 09:58:27 -08:00
Tony Mantler
426de73380 Fix unbounded async task creation in ADS
Queue operations through a single ConcurrentLinkedQueue and
service the updates on a single async task to avoid spamming the
async thread task queue.

b/11336926

Change-Id: I8e5c526d61f70fbad0ccef80afd08fc26bb5acf0
2014-02-19 09:48:58 -08:00
Tony Mantler
822f17d6c1 Merge "Mark otherwise unused method as @VisibleForTesting" into ub-mail-master 2014-02-19 00:11:01 +00:00
Tony Mantler
feeb1e3ada Mark otherwise unused method as @VisibleForTesting
Also fix spelling cancellAllInterrupt -> cancelAllInterrupt

b/13082964

Change-Id: I2fef949bb351a536fdd0d7058b3df2b03eecb39e
2014-02-18 15:59:03 -08:00
Martin Hibdon
d9cec23689 Fix the build
I merged some previous changes wrong.

Change-Id: I8af86e398dc4875aae4251e821ac42b8b8fea354
2014-02-18 15:01:16 -08:00