e8cdcc7250
Merge "Cleanup of AttachmentService code and enabling of DownloadQueue." into ub-mail-master
2014-05-30 22:06:49 +00:00
163323294e
Change IEmailService.sync to have two different forms
...
Change-Id: Id8e770154d6116b02746cbdfb8c7cdc9358398de
2014-05-30 14:49:47 -07:00
6dce0b1819
"No quick responses available" should display when all quick responses are deleted
...
b/14239989
We take advantage of ListView's feature that displays an entirely different
view in place when the backing Adapter is empty. The empty view is simply a
TextView displaying "No quick responses available".
Change-Id: I244ffd21fc4c1557c73979d4bb7c99306b11ebb2
2014-05-30 14:49:05 -07:00
e33511699a
Cleanup of AttachmentService code and enabling of DownloadQueue.
...
Removed unused functions, 'final'ed variables and parameters,
revisited some thread synchronization. Effectively no new code
introduced so no unit tests for this CL.
Change-Id: I714724a98d31a231ab10b0ad468b8efaa460bd1d
2014-05-30 13:26:08 -07:00
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
4e6aa25286
Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev
2014-05-28 19:38:41 +00:00
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
4ce1fc7669
Disambiguate settings intents
...
b/13325901
Change-Id: I2843a6bfdac4acbabc758ddc44f1d980b7036aef
2014-05-22 14:31:22 -07:00
92a059ece4
Merge "Revert "Get rid of deleteAccountPIMData from IEmailService"" into ub-mail-master
2014-05-21 20:43:10 +00:00
c5f5a14ae9
Revert "Get rid of deleteAccountPIMData from IEmailService"
...
This reverts commit cf2178c4fa
2014-05-21 20:41:37 +00:00
9598c1e817
Merge "Get rid of deleteAccountPIMData from IEmailService" into ub-mail-master
2014-05-21 20:31:08 +00:00
332f544991
Merge "Sanitize HTML email bodies in Android Email" into ub-mail-master
2014-05-21 20:12:06 +00:00
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
44d3500f7a
Merge "Remove unused constant" into ub-mail-master
2014-05-21 17:53:04 +00:00
5021265826
Merge "Test encode/decode of attachments" into ub-mail-master
2014-05-21 17:48:53 +00:00
4abb30384f
Remove unused constant
...
b/15133133
Change-Id: Ia89829e796dadf48f0257adb994c7102b7d30baf
2014-05-21 10:33:15 -07:00
5a93b8f7c6
Test encode/decode of attachments
...
b/15089448
Change-Id: Ifd2afcfb36c9820c5d64ebbcc3230603b2a27089
2014-05-21 10:25:08 -07:00
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
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
6c31d220a8
Support hooks for new contact photo source.
...
b/11387812
Change-Id: If081d58941dca0a330905dc2d80148df336995d5
2014-05-20 14:40:08 -07:00
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
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
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
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
cd4a94b7e1
Dependent change caused by refactor of FolderSelectors
...
b/9174917
Change-Id: I1d644fe52b3b3e0c3428c6007d4c591a87a45e6c
2014-05-19 12:41:00 -07:00
28dd431c23
Fix the remainder of save-alert cases
...
b/14969455
Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
2014-05-15 14:58:54 -07:00
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
2c26bb3b09
Disable the debug menu
...
b/14995079
Change-Id: I0b7fa2edc7cf7cdac97aba9412a18aece09cb5c2
2014-05-15 13:35:33 -07:00
c1265d2090
Merge "Move email bodies to files" into ub-mail-master
2014-05-15 16:43:00 +00:00
018ff4b464
Merge "Fix FLAG_OAUTH usage" into ub-mail-master
2014-05-15 16:42:41 +00:00
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
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
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
82a207132b
Move account backup/restore to userdata in AccountManager
...
Change-Id: Iea9f2a1b1f2d87e07d63cbb1df5a0d6355ea4031
2014-05-14 15:15:49 -07:00
7525feb244
Move email bodies to files
...
Change-Id: Icfd0c4ab2ad25cc02b45cf41e7a205c17948ef2c
2014-05-14 13:27:49 -07:00
97ddf6e5fa
Merge "Fix URI comparison" into ub-mail-master
2014-05-14 18:34:33 +00:00
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
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
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
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
6825796063
Create separate thread pool for EmailMessageCursor
...
This avoids a potential thread starvation issue if all running threads
in the default parallel executor are stalled waiting to read from the
threads created here.
Change-Id: I32f030b3e7ff3d8f69453ae5946704efb19ee25f
2014-05-07 16:40:34 -07:00
84e010a463
Clean up logging
...
b/14590064
Change-Id: Ib841ebecae339690c143eaf356eced58d9ac5372
2014-05-06 11:22:10 -07:00
91e8e6f709
Null check EmailServiceInfo
...
b/14567915
Change-Id: I4780835a7f195f1a825a1538f9f1b939e2be4214
2014-05-05 13:59:39 -07:00
b5713fb731
am 81f9a57a: Fix some STOPSHIP logging
...
* commit '81f9a57a655fe842ddd86b14afe75bcd575edb81':
Fix some STOPSHIP logging
2014-05-05 20:19:12 +00:00
81f9a57a65
Fix some STOPSHIP logging
...
b/14564870
Change-Id: I9365013eacde23178578b45f728713f80417bc7a
2014-05-05 13:04:19 -07:00
4db2d1cf74
Escape string values passed into SQL
...
b/14562987
Change-Id: Ibefd8d1d7418fffe4467abdae0cf978228d303a0
2014-05-05 10:51:44 -07:00
f837c474a4
resolved conflicts for merge of 0d7c7091 to ub-mail-master
...
Change-Id: Id754089f16146daf0c07f77208d55c2406c997c5
2014-05-01 15:27:21 -07:00
0d7c709125
Always return a valid Uri for account inbox
...
Also don't return virtual folders unless real folders exist
b/14319452
Change-Id: Id5f62f5ccc4d5488ae467df741b0598a158ceb81
2014-05-01 15:05:15 -07:00
988d2b6e85
Fix Exchange crash when parsing abbreviated dates
...
Detect fully qualified and abbreviated date/time stamps in parseDateTime.
Previously parsed fully qualified forms like 20090211T180303Z; now also
parses 20090211.
Bug:14279251
Change-Id: I9a99ae16a5c1fe87b977fbebdba307baa653d539
2014-04-30 09:53:00 -07:00
cd2495ebdd
Created the new AttachmentService class.
...
This is a straight up copy of the AttachmentDownloadService and
a rename. All the future Attachment work will be done in this
class and we'll flip the switch when it is ready.
Change-Id: I2990cbfd1f7c8e2946c155ea1c124223d0f47ff9
2014-04-29 11:20:40 -07:00
2ac92114ad
Merge "Fix cancel handling in account settings screens" into ub-mail-master
2014-04-25 00:41:28 +00:00
294593c5f5
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
2014-04-24 16:12:55 -07:00
d4088d1b8a
am 241eeec2: Remove save to drive from eml viewer. b/14277510
...
* commit '241eeec2b3f7f5a0159d1a313c31d6682c439511':
Remove save to drive from eml viewer. b/14277510
2014-04-24 21:53:40 +00:00
241eeec2b3
Remove save to drive from eml viewer. b/14277510
...
Change-Id: I918e66fb009976543bcb8a58b1b4597a5b268062
2014-04-24 10:39:58 -07:00
70d7473fb9
am 92581f78: Move the setup nav buttons to the bottom on tablets
...
* commit '92581f78207a23b0777795f5d5ffcff683aa1e21':
Move the setup nav buttons to the bottom on tablets
2014-04-23 17:38:10 +00:00
92581f7820
Move the setup nav buttons to the bottom on tablets
...
b/14187851
Now the bars on the sides for tablet landscape setup are actually
in the activity, not the fragment. The setup fragment template
is identical between tablet and phone, with any differences between
them contained in different styles or dimensions.
Change-Id: Id7005f73aa29ed6010e629873155eb5fdc8e818f
2014-04-23 10:34:16 -07:00
b3d0bda59d
am 91eec1a5: Use the correct string for the password label
...
* commit '91eec1a519562149fff96e37299f492d25a49551':
Use the correct string for the password label
2014-04-23 00:51:50 +00:00
91eec1a519
Use the correct string for the password label
...
b/14257168
Change-Id: I08a73bbb91bd4f897617617b67cf51fe4f0c2b7f
2014-04-22 17:31:47 -07:00
6bc254d0ed
am 8b063aa9: Fix a typo I introduced in a previous change
...
* commit '8b063aa9797dae585b98be97ad6f503404bc78f7':
Fix a typo I introduced in a previous change
2014-04-23 00:24:33 +00:00
8b063aa979
Fix a typo I introduced in a previous change
...
b/14257168
In this CL I changed the name of a string, but missed one
place where it was references.
https://googleplex-android-review.git.corp.google.com/#/c/453472/
Change-Id: I7d943a2209f2defb6f0eb846b6f361a08f40f756
2014-04-22 17:19:33 -07:00
bd51bc5c6a
am 0dae4d3f: Update a bunch of layouts
...
* commit '0dae4d3ffb65eb23d5a2ea19acd4603cfba914cd':
Update a bunch of layouts
2014-04-22 21:55:32 +00:00
0dae4d3ffb
Update a bunch of layouts
...
b/14169396
Swap the positions of the headline text and email image
on account setup basics
b/14257403
Swap the positions of the password and "signed in with XXX"
button on the credentials fragment
b/14255447
Adjust padding to fix a number of alignment issues.
Change-Id: I011e259a86123cf205d86407def2ff774744e005
2014-04-22 14:46:32 -07:00
8cfbfb50bb
Inline images are not displayed for IMAP and POP emails
...
b/11998344
This solution covers these use cases:
1) Inline images in the Email app.
2) Inline images in .eml attachments in the Email and Gmail apps.
The solution here was to override shouldInterceptRequest(...) in
the WebViewClients and resolve any cid urls that are encountered
within the email body.
EmailProvider and EmlAttachmentProvider both gained the ability to
query for an Attachment object using a message ID and cid (which
is stored in the database column: contentId).
With this new query in place, it was straightforward to fetch the
Attachment in the WebViewClient and then obtain an InputStream to
the file that backs the Attachment to return back to the WebView.
Change-Id: I865a74fc291915c0d66a7492763a5f5682365b92
2014-04-22 11:29:19 -07:00
80b26f9f4c
Fixed the id vs messageKey confusion in the code based on caller. Also
...
make sure that we split the code that reads the HTML vs text body into
seperate try-catch blocks because they can fail seperately.
Change-Id: I55bdac469840e8ff84f7c00ccb34d188da072a8e
2014-04-22 10:14:23 -07:00
8c91d2e34b
am f501d41c: Merge "Add cross-fade to setup flow" into ub-mail-algol
...
* commit 'f501d41c7b652ec82f077ad90e11544dc02d0563':
Add cross-fade to setup flow
2014-04-18 22:39:34 +00:00
f501d41c7b
Merge "Add cross-fade to setup flow" into ub-mail-algol
2014-04-18 22:37:32 +00:00
b5fd6b8905
Add cross-fade to setup flow
...
b/14164262
Change-Id: I41fe0bf5661d9f7a2b5051604c0b6dbfc4506414
2014-04-18 14:54:55 -07:00
42a4dbbf93
Refactor addMailbox() a bit and clean up warnings
...
Change-Id: I8497f74ec61c380ae4e69487121c50933f568965
2014-04-18 14:28:28 -07:00
3c73a04bec
Continue purging the unused reply parts
...
Change-Id: I47b5bbe50ba36e68ad7ba80647f401b992660ba1
2014-04-18 14:04:23 -07:00
f0db9ce9ab
Clean up LegacyConversions
...
Change-Id: I9cb9bf8a08663004a497af9f52e3ab0647bd2168
2014-04-18 13:36:18 -07:00
a5ba759443
am b2fd4d25: Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol
...
* commit 'b2fd4d25767938bf693aba12f73f1dd0ee462427':
Make AccountSettings implement callbacks for check settings dialog
2014-04-18 19:03:26 +00:00
1c594b8050
Make AccountSettings implement callbacks for check settings dialog
...
b/14120112
Change-Id: I9834a772e90d2d13f16a84a70651286759bc9dbc
2014-04-18 11:16:57 -07:00
502f6ad7ea
Tidy up saveAttachmentBody
...
Change-Id: I1852ad7d94eec15feb661a87f81869a554d595af
2014-04-17 16:19:23 -07:00
fd69e5b036
Purge unused/obsolete body fields
...
Change-Id: Idafa09b58f5753e4cb3cad754c861cc8e3d80c34
2014-04-17 14:32:10 -07:00
0e26184ac7
am 6529f2c9: Add some null-checks
...
* commit '6529f2c99d24f0dd801ed142ce946b46c92d5e9f':
Add some null-checks
2014-04-17 18:56:23 +00:00
6529f2c99d
Add some null-checks
...
b/14117436
b/14120112
Change-Id: I0f56e036ec1a78887523d90ab4e6cda3a05accdf
2014-04-17 11:50:25 -07:00
592a85d97d
am 1bb18931: Send PLID with message instead of conversation.
...
* commit '1bb18931e29dfe55a9b3368bd2393ac57c5fdebb':
Send PLID with message instead of conversation.
2014-04-17 17:20:04 +00:00
9caaebb142
Bypass the cursor completely when passing message within EmailContent contexts
...
We should investigate using PFDs when passing to the UI layer too, for consistency
Change-Id: I21ad1987926b93af20287ae8e49bfc7a4ad99570
2014-04-16 16:49:29 -07:00
1bb18931e2
Send PLID with message instead of conversation.
...
Fixes b/13748439. Sending with conversation required
server-side changes and wasn't actually more memory efficient.
Arguably it would be less efficient.
Change-Id: I8e1be03e183c65e169da5152a4763d5f80460bb9
2014-04-16 11:48:59 -07:00
1b8cb007ba
am cdfffcf4: Merge "Don\'t re-add fragment if it\'s already been added" into ub-mail-algol
...
* commit 'cdfffcf4609336445cbaade49581d07ad10e7bf1':
Don't re-add fragment if it's already been added
2014-04-16 17:46:34 +00:00
cdfffcf460
Merge "Don't re-add fragment if it's already been added" into ub-mail-algol
2014-04-16 17:44:04 +00:00
4822b266ef
Don't re-add fragment if it's already been added
...
b/14088388
Change-Id: Ie86220f2ab3bf6286ba206248b79291a51b04fad
2014-04-16 10:31:45 -07:00
131baa26a1
am 75d60f04: Merge "Null check mCheckFrequency before using" into ub-mail-algol
...
* commit '75d60f045b8344f7a894e895c1bd95957f5e24bf':
Null check mCheckFrequency before using
2014-04-16 17:20:17 +00:00
75d60f045b
Merge "Null check mCheckFrequency before using" into ub-mail-algol
2014-04-16 17:17:15 +00:00
8a12526a7f
am 91ad2631: Be more blunt about saving the right fragment reference
...
* commit '91ad26315a8769f92af469b06e24033ffd9e6caf':
Be more blunt about saving the right fragment reference
2014-04-16 17:17:03 +00:00
0151a6af62
Null check mCheckFrequency before using
...
b/14091609
Change-Id: I796774b7133ec68382d2580d0b1cde347aa143f8
2014-04-16 10:11:55 -07:00
91ad26315a
Be more blunt about saving the right fragment reference
...
Apparently fragment IDs get recycled so storing the fragment reference
in a bundle can return the wrong fragment later, so that's great.
b/14094356
Change-Id: I7ce4ae46f51371b4179c7e85c343ab86162b5a95
2014-04-16 10:05:44 -07:00
204982897b
Merge "Bypass the cursor window for email bodies" into ub-mail-master
2014-04-15 22:43:57 +00:00
f678a18b69
Bypass the cursor window for email bodies
...
b/11787468
Change-Id: Iba5faa5b825357144d07ec4dfcf010c6af50496d
2014-04-15 15:18:17 -07:00
90118635a9
am 1f4d6e9a: Use the correct R import
...
* commit '1f4d6e9aa9f6f219f14951e2966043ac379e262c':
Use the correct R import
2014-04-15 22:06:45 +00:00
1f4d6e9aa9
Use the correct R import
...
Change-Id: I087087079a47df7693dbec662d53dc73f7bcba43
2014-04-15 14:49:41 -07:00
3dd85723a1
Cleanup in EmailContent
...
Change-Id: Ifa251eb206779f59ea003f99395d454c7e407bc2
2014-04-14 12:54:39 -07:00
135853d3bc
tighten inline attachment view intent builder
...
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
(cherry picked from commit 5687c6dade
2014-04-10 23:14:07 +00:00
add018e4fd
am 2172ac41: Merge "Correctly initialize the authentication view" into ub-mail-algol
...
* commit '2172ac410add578021715d34a92c1bcaff4f3560':
Correctly initialize the authentication view
2014-04-10 23:12:33 +00:00
2172ac410a
Merge "Correctly initialize the authentication view" into ub-mail-algol
2014-04-10 23:09:46 +00:00
da9189990a
am c83366c8: Fix some crashes and misbehavior with account settings screens
...
* commit 'c83366c88770f336a8e9976af42389c616de0b62':
Fix some crashes and misbehavior with account settings screens
2014-04-10 23:06:15 +00:00
12e7d101e8
Correctly initialize the authentication view
...
b/13961322
Change-Id: I96067b30c54131cc65a0282b118f9821d363113b
2014-04-10 16:01:06 -07:00
c83366c887
Fix some crashes and misbehavior with account settings screens
...
b/13954490
Change-Id: Ic81b342495a46573cb1fe78cad1f4888fffc4ae8
2014-04-10 15:28:15 -07:00
e8c4c22268
Enable Empty Trash in Email
...
Add markContentsSeen() and emptyFolder() to EmailConversationCursor.
Add 'purge folder' URI for delete() call in EmailProvider.
Change-Id: I2f65f877f8f4e8376eb5c2149b5051931c2ac083
2014-04-10 12:06:43 -07:00
bae63123ec
Merge "Move EmailConversationCursor out of EmailProvider" into ub-mail-master
2014-04-09 22:32:21 +00:00
0053401d07
Move EmailConversationCursor out of EmailProvider
...
Also tidy warnings in EmailProvider
Change-Id: Ib41011cc4b43adf0272be22bc7c054a99ff58309
2014-04-09 14:20:08 -07:00
816474e8ef
am d896fa8a: Merge "Fix an NPE in sendCommandInternal" into ub-mail-algol
...
* commit 'd896fa8a2ea455a58deb415b9456e6fadefe3fd0':
Fix an NPE in sendCommandInternal
2014-04-09 20:13:58 +00:00
d896fa8a2e
Merge "Fix an NPE in sendCommandInternal" into ub-mail-algol
2014-04-09 20:12:24 +00:00
61ce02ea47
am 9d06daa8: Increase padding above labels in setup flow
...
* commit '9d06daa8039cd934bcd17f8e14a4d3a926932a3c':
Increase padding above labels in setup flow
2014-04-09 19:37:44 +00:00
2a7411b57b
Fix an NPE in sendCommandInternal
...
b/13929234
Change-Id: I362682bde3c24123178e68811604f0180c853598
2014-04-09 11:22:52 -07:00
9d06daa803
Increase padding above labels in setup flow
...
b/13640327
Change-Id: I54e98855566adc45dcd410186c2e7ea322dc1a58
2014-04-09 11:16:46 -07:00
9eaf30bf17
am 35bda06a: Fix NPE when configuring POP accounts, which don\'t have a background attachments setting
...
* commit '35bda06a1c1f5bb6a53e41cb88d6ac2005bbe415':
Fix NPE when configuring POP accounts, which don't have a background attachments setting
2014-04-09 18:00:46 +00:00
049bfae98b
am 84366ae2: Merge "Fix attachment loading for messages which have been forwarded" into ub-mail-algol
...
* commit '84366ae2735e541693b3bc016b86e468ff216cdc':
Fix attachment loading for messages which have been forwarded
2014-04-09 18:00:45 +00:00
35bda06a1c
Fix NPE when configuring POP accounts, which don't have a background attachments setting
...
b/13929109
Change-Id: Idd915ddaa55010c588ce7798dd23a403e538c8da
2014-04-09 10:24:04 -07:00
84366ae273
Merge "Fix attachment loading for messages which have been forwarded" into ub-mail-algol
2014-04-08 22:17:56 +00:00
0680ba5e25
am d58b4904: Fix a potential stack overflow error
...
* commit 'd58b490479bbde719d3e8626382c04829be6bbca':
Fix a potential stack overflow error
2014-04-08 22:01:12 +00:00
d58b490479
Fix a potential stack overflow error
...
b/13906567
Change-Id: I21be980d4b4878ada0df6d3af706fee55afb4f2b
2014-04-08 14:35:53 -07:00
2aeb498d4e
Fix attachment loading for messages which have been forwarded
...
These attachments have a contentUri where the attachment ID is not equal
to the ID of the actual attachment.
b/13900073
Change-Id: Ic62b8165be2e80bc47eac40dc9eb5ac53c3cd6c5
2014-04-08 14:18:56 -07:00
fdc8a744b5
am 142f12ea: Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol
...
* commit '142f12ea934444e8ecd0a06be4aeb56439546e13':
Fix IMAP attachment upsync for forwarded messages
2014-04-07 23:57:48 +00:00
142f12ea93
Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol
2014-04-07 23:54:32 +00:00
84dfa15541
Fix IMAP attachment upsync for forwarded messages
...
b/13883967
Change-Id: I496663144c41fa6353883bb77fa35fb14d1cfa07
2014-04-07 16:26:04 -07:00
e48195bfdc
am 94acc8e4: Merge "Fix the names of the save state contants" into ub-mail-algol
...
* commit '94acc8e485dc5fbcd6cf11104a9f2ac9c14f62e5':
Fix the names of the save state contants
2014-04-07 23:21:16 +00:00
2eb7f1babc
Fix the names of the save state contants
...
b/13624066
Change-Id: I0fabcfbf659e51de3dfe2fc9b72bd88f86e576a6
2014-04-07 15:36:53 -07:00
268b75f818
am a8474c52: Merge "Save and restore sync interval values and strings" into ub-mail-algol
...
* commit 'a8474c5273f9cfd5e9e4750f9ab9af94f3894635':
Save and restore sync interval values and strings
2014-04-07 21:14:12 +00:00
a8474c5273
Merge "Save and restore sync interval values and strings" into ub-mail-algol
2014-04-07 21:08:29 +00:00
ddcb95f0e7
Save and restore sync interval values and strings
...
b/13624066
Change-Id: I14c243a7f7ae71e5d6fbdedda328dc01bb2eae85
2014-04-07 13:30:58 -07:00
b09dd77d95
am 6cbdd5bb: Fix more IME actions
...
* commit '6cbdd5bba0c9c68a3261e54b1cebff48459657d5':
Fix more IME actions
2014-04-07 16:30:50 +00:00
6cbdd5bba0
Fix more IME actions
...
b/13544189
Change-Id: I5dbbf45a1b68cac2d63ba41c70daff9d33cbb492
2014-04-04 16:36:06 -07:00
df2fe89e81
am c9df9390: Make "Manual setup" underlined
...
* commit 'c9df939011dbb54278afc32f5b4c0fabe940e0d3':
Make "Manual setup" underlined
2014-04-04 23:18:25 +00:00
c9df939011
Make "Manual setup" underlined
...
That was easier than expected.
b/13814534
Change-Id: I288dc04a91d98800ec351cf1a6ad642755947925
2014-04-04 15:35:52 -07:00
2dfa5cdf3f
am 47752716: Merge "Fix a crash signing in with oauth" into ub-mail-algol
...
* commit '4775271611401a4d9b0c495e7ffe09fffbc1633d':
Fix a crash signing in with oauth
2014-04-04 22:03:51 +00:00
4775271611
Merge "Fix a crash signing in with oauth" into ub-mail-algol
2014-04-04 21:59:06 +00:00
3144149f73
Fix a crash signing in with oauth
...
b/13753410
Change-Id: Ie5909b3db9263d261a422e8fe39e424180f326b9
2014-04-04 14:55:13 -07:00
1baa2e5324
am a0617312: Merge "More "Manual Setup" button tweaks" into ub-mail-algol
...
* commit 'a061731281bd437aaec9b7f327b28cd3c246026f':
More "Manual Setup" button tweaks
2014-04-04 17:48:43 +00:00
a061731281
Merge "More "Manual Setup" button tweaks" into ub-mail-algol
2014-04-04 17:43:03 +00:00
a67a905542
More "Manual Setup" button tweaks
...
b/13750692
Change-Id: I8e4c7cc1cb74af16998ec26aae506d30735ed068
2014-04-04 10:10:25 -07:00
0ab326edb4
am 8e456537: Merge "Bound the number of headers we might try to fetch" into ub-mail-algol
...
* commit '8e456537523966bb72b7cac66b3cb7ec04922562':
Bound the number of headers we might try to fetch
2014-04-03 21:47:59 +00:00
ec454e092e
am 44a443b4: Merge "Make oauth error handling localizable" into ub-mail-algol
...
* commit '44a443b4e35f68a38ee73b1ce959302b0b3e74b6':
Make oauth error handling localizable
2014-04-03 21:47:58 +00:00
8e45653752
Merge "Bound the number of headers we might try to fetch" into ub-mail-algol
2014-04-03 21:45:08 +00:00
44a443b4e3
Merge "Make oauth error handling localizable" into ub-mail-algol
2014-04-03 21:44:59 +00:00
8cb95732b0
Make oauth error handling localizable
...
Also, add some logging to track down b/13545303
Change-Id: I44a0d63b5c3b53018b48eb1c58d6a9ff74bddd9c
2014-04-03 14:28:50 -07:00
7ea823327f
Bound the number of headers we might try to fetch
...
b/13545303
Prior to this change, there is no bound on the number of message
headers we might try to fetch at the same time. Now, we fetch
headers in chunks of limited size.
Change-Id: I06db96eefa8732f970c31fc3617480de40723f2d
2014-04-03 14:23:47 -07:00
406c87d852
am e453e7dd: Merge "b/13734162. Make sure that SmartForward is enabled on EAS accounts." into ub-mail-algol
...
* commit 'e453e7dd29aa5b051cca18670f25e139fb784350':
b/13734162. Make sure that SmartForward is enabled on EAS accounts.
2014-04-02 23:31:57 +00:00
d12032bd09
am 4c6338bf: Make sure HostAuths are populated on manual setup
...
* commit '4c6338bf1a87fa2829ff788d6493f31e952905aa':
Make sure HostAuths are populated on manual setup
2014-04-02 23:31:56 +00:00
cbc3d6abbc
am 68da1ad7: Merge "Add missing call to super.onSaveInstanceState()" into ub-mail-algol
...
* commit '68da1ad73fcc19efec7b5ef2f3fcd67de19d0d68':
Add missing call to super.onSaveInstanceState()
2014-04-02 23:31:55 +00:00
88ef9a6ce2
am 0976275d: Merge "Change \'Manual setup\' into clickable text instead of a checkbox" into ub-mail-algol
...
* commit '0976275d7a4854d90d943c50a10d37db2e7f5ece':
Change 'Manual setup' into clickable text instead of a checkbox
2014-04-02 23:31:55 +00:00
1498223043
am 1a9c5fe7: Fix automatic account creation
...
* commit '1a9c5fe7ade0c95c155e9b8dade7b7e1ee3cb6f5':
Fix automatic account creation
2014-04-02 23:31:54 +00:00
3ec20d5eeb
am 0db900d6: Merge "Allow setting of the sync window for IMAP accounts" into ub-mail-algol
...
* commit '0db900d62247b66b3de2eb665145e239141e670e':
Allow setting of the sync window for IMAP accounts
2014-04-02 22:57:08 +00:00
77c20133ba
am ecd23cf0: Check amProtocol for empty before assuming the user picked a different protocol
...
* commit 'ecd23cf0f29c10c11c6af5022de81be7757b6017':
Check amProtocol for empty before assuming the user picked a different protocol
2014-04-02 22:57:06 +00:00
5b24227741
am f456b4f9: Merge "Show "To:<Names>" in sent and outbox index views" into ub-mail-algol
...
* commit 'f456b4f9d49ebc2ffaf191e8faa55ec73fcb3814':
Show "To:<Names>" in sent and outbox index views
2014-04-02 22:56:58 +00:00
ef2d771252
am 603d1bfa: Merge "Fix an out-of-date comment." into ub-mail-algol
...
* commit '603d1bfa5ed12fa3a54c660ac4cc0c753e0cde8e':
Fix an out-of-date comment.
2014-04-02 22:56:57 +00:00
10318650a6
am 8a5a5779: Merge "b/13659368. Ensure properly download status for attachments on failures." into ub-mail-algol
...
* commit '8a5a5779a3072ed4d1372c64e694e8fbad6cf76c':
b/13659368. Ensure properly download status for attachments on failures.
2014-04-02 22:56:56 +00:00
757656742e
am 296cde56: Add disambiguation screen when user protocol choice differs from providers.xml
...
* commit '296cde560348435ba2a64cc9ac308115721b88b3':
Add disambiguation screen when user protocol choice differs from providers.xml
2014-04-02 22:56:53 +00:00
538bb718af
am ca7df3f2: Begone, foul keyboard!
...
* commit 'ca7df3f234b0434caab0ca9149b19bad9955777a':
Begone, foul keyboard!
2014-04-02 22:56:52 +00:00
1d074abc2c
am 5057d6df: Replying to a Message with an encoded email address shows the encoded address in the to field.
...
* commit '5057d6dffb994b4d1d02c05e06f679de8ef05ea5':
Replying to a Message with an encoded email address shows the encoded address in the to field.
2014-04-02 22:56:50 +00:00
e453e7dd29
Merge "b/13734162. Make sure that SmartForward is enabled on EAS accounts." into ub-mail-algol
2014-04-02 22:08:04 +00:00
6f7c1c824d
b/13734162. Make sure that SmartForward is enabled on EAS accounts.
...
This is an Algol only fix that needs to be reconsidered for L.
The fix comes in 2 parts. The first addresses existing accounts.
The second addresses new accounts. First we check that the protocol
is EAS and then we check the protocol version to be greater than
12.0 before setting the flags. In the future, the protocol specific
flags should be set in the protocol specific components.
Change-Id: I00a6fa3337d5230801f6de8876332c66deeae2c4
2014-04-02 14:07:41 -07:00
4c6338bf1a
Make sure HostAuths are populated on manual setup
...
b/13751284
Change-Id: I61aa94e7ebedc5550854731caa068b9e577c2b3b
2014-04-02 13:30:51 -07:00
68da1ad73f
Merge "Add missing call to super.onSaveInstanceState()" into ub-mail-algol
2014-04-01 23:00:43 +00:00
0976275d7a
Merge "Change 'Manual setup' into clickable text instead of a checkbox" into ub-mail-algol
2014-04-01 22:56:52 +00:00
14178ca1e3
Add missing call to super.onSaveInstanceState()
...
b/13750715
Change-Id: I328e25f355b60217b2dbc874fff9bd3742e79f90
2014-04-01 15:55:51 -07:00
1a9c5fe7ad
Fix automatic account creation
...
b/13695686
Change-Id: I108989e50337a839c42fdff1cc11697d8adee954
2014-04-01 15:10:18 -07:00
392c263c19
Change 'Manual setup' into clickable text instead of a checkbox
...
b/13733521
Change-Id: I7f338cbfb8357c5e1a27c6e886ea96e5c6924d22
2014-04-01 14:11:15 -07:00
0db900d622
Merge "Allow setting of the sync window for IMAP accounts" into ub-mail-algol
2014-04-01 19:54:31 +00:00
c0d94a44ea
Allow setting of the sync window for IMAP accounts
...
b/13362667
Really this is just for testing, the only window setting
that has any affect is SYNC_WINDOW_ALL. At some point we
should revisit the imap sync window strategy, right now
we will sync up to the oldest message currently on the
device, which is potentially a large amount of data.
Change-Id: I00dd59bd084e85bdf80f3991062b84fcd6a12362
2014-04-01 12:17:34 -07:00
ecd23cf0f2
Check amProtocol for empty before assuming the user picked a different protocol
...
b/13734367
Change-Id: I36514cedc31f9a02c627e921b37fdb500d0ab74c
2014-03-31 16:43:14 -07:00
f456b4f9d4
Merge "Show "To:<Names>" in sent and outbox index views" into ub-mail-algol
2014-03-31 21:11:40 +00:00
603d1bfa5e
Merge "Fix an out-of-date comment." into ub-mail-algol
2014-03-31 21:11:19 +00:00
974ccb1735
Fix an out-of-date comment.
...
The code related to the comment didn't ship as part of Kitkat MR2 and instead will go out with the platform L release.
Change-Id: Ib9ece3390005b5b0217e0c5540322802b1c096ad
2014-03-31 21:09:51 +00:00
8a5a5779a3
Merge "b/13659368. Ensure properly download status for attachments on failures." into ub-mail-algol
2014-03-31 20:47:27 +00:00
b6125ae385
b/13659368. Ensure properly download status for attachments on failures.
...
The reason why the UI is wedged is becasue it doesn't
see a state transition in the status. So now we detect the situation
where the user is trying to download an ineligible file and force
the status to indicate that it was a failure to dismiss the UI and
to show the correct error message.
Change-Id: I9264966830a317724bf2fe469ae570860ba7c2a9
2014-03-31 13:21:28 -07:00
469c426376
Show "To:<Names>" in sent and outbox index views
...
b/13304929
The solution being delivered introduces a new folder capability:
UIProvider.FolderCapabilities.SHOW_RECIPIENTS which indicates a folder
should display "To: " in front of its participants list because it
is a folder containing outgoing mail or sent mail (thus viewing
recipients is more useful than senders). This capability is returned
for Drafts, Sent, and Outbox.
Note that extra work was required to make this function properly in
the widget we export to the launcher. See BaseWidgetProvider and
friends for details.
Change-Id: Ie7b077b8dd8934182de5e94a90fa163e8105faac
2014-03-31 12:35:15 -07:00
296cde5603
Add disambiguation screen when user protocol choice differs from providers.xml
...
b/13640868
Change-Id: I75116f30e9c12d2e8b6757bf208e1519e438aed9
2014-03-28 17:08:04 -07:00
ca7df3f234
Begone, foul keyboard!
...
Hide keyboard when advancing setup screens
b/13640446
Change-Id: I913a6afe9bcd4864bf218cab59a3d9e84b23f7d9
2014-03-28 11:20:23 -07:00
5057d6dffb
Replying to a Message with an encoded email address shows the encoded address in the to field.
...
b/11658428
As per Yu Ping's advice, we alter the storage of all email addresses (from, to, cc, bcc and
replyto) to be stored in *decoded* format within our database. This makes them both human
readable when inspecting the database manually and alleviates the need to repeatedly decode
them before they are displayed anywhere in our UI layers.
As part of this bugfix, I resurrected several tests related to the LegacyConversions class out of
LegacyConversionsTests and into a new (not Suppressed) test class: LegacyConversionsTest
Change-Id: Ie2e3264646e25c08c4ba74f60b3e1090c052e6c6
2014-03-27 23:25:53 +00:00
c7031638bd
Minor formatting change
...
b/13642247
Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
(cherry picked from commit 64b4f7dcff
2014-03-27 21:30:37 +00:00
23ff99df9d
Merge "Fix IMAP message upsync to include attachments." into ub-mail-algol
2014-03-27 21:30:08 +00:00
38f9991634
Fix IMAP message upsync to include attachments.
...
b/13138456
Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
(cherry picked from commit 0c8696c2eb
2014-03-27 21:23:32 +00:00
e5d754e16c
Fix a NPE trying to download an attachment
...
b/13642247
Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
(cherry picked from commit adabb4285b
2014-03-27 21:22:28 +00:00
30dc25c390
am 41e3f37b: Merge "b/13659097. Disable EAS Policy max attachment size from EmailProvider." into ub-mail-algol
...
* commit '41e3f37b501ea787c6569f4ac22a11d269dd6557':
b/13659097. Disable EAS Policy max attachment size from EmailProvider.
2014-03-27 18:46:13 +00:00
a68ab80305
b/13659097. Disable EAS Policy max attachment size from EmailProvider.
...
Disable the code that translates the max attachment size column of
our db to the EmailProvider max attachment size column. They mean
different things as our max attachment size column refers to the max
size of any file that we can download where the EmailProvider's version
represents the max attachment size of a file that we can upload.
Change-Id: I93202766d7b1782c902f17ce20b2823aaf647ec4
2014-03-27 11:37:41 -07:00
2be297f1ba
Merge "Fix IMAP message upsync to include attachments." into ub-mail-master
2014-03-26 19:53:57 +00:00
0c8696c2eb
Fix IMAP message upsync to include attachments.
...
b/13138456
Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
2014-03-26 11:49:38 -07:00
77ba9a751f
Merge "Minor formatting change" into ub-mail-master
2014-03-26 18:03:09 +00:00
64b4f7dcff
Minor formatting change
...
b/13642247
Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
2014-03-26 10:47:54 -07:00
a44a63e273
Merge "Fix a NPE trying to download an attachment" into ub-mail-master
2014-03-26 17:46:58 +00:00
adabb4285b
Fix a NPE trying to download an attachment
...
b/13642247
Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
2014-03-26 10:38:51 -07:00
5687c6dade
tighten inline attachment view intent builder
...
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
2014-03-25 13:30:16 -07:00
3f4a556d54
Fix Calendar and Contacts syncing for POP and IMAP accounts
...
b/11818312
Change-Id: I34b82040991506bf9099cc0df237454a8f97c764
2014-03-24 17:17:05 -07:00
3021a60bc7
Merge "Only make Calendar and Contacts syncable on Exchange" into ub-mail-master
2014-03-20 19:57:05 +00:00
6a51abdf6e
Only make Calendar and Contacts syncable on Exchange
...
b/11818312
We were using the existance of OPTIONS_CALENDAR_SYNC in the
bundle to indicate that syncing was possible, and it's value
to indicate whether automatic syncing should be enabled.
This is misleading.
Now, we check the serviceInfo for the account type to figure
out if sync calendar and contacts is possible, and use the
options passed in to indicate whether or not it should be
automatic.
Change-Id: I776519668c6630dc71153fb008218a7ca6357c74
2014-03-20 12:47:36 -07:00
eba80c114e
b/9564335. Add support for a maxAttachmentSize column in the Account
...
table and connect the data to the Settings object in the existing
location (SettingsColumns.MAX_ATTACHMENT_SIZE).
Change-Id: Iaf48995757511e1dfb65aa35ff6d81bbc47187bd
Conflicts:
src/com/android/email/provider/DBHelper.java
2014-03-19 17:33:29 -07:00
8103f960d0
Add sync to IEmailService.
...
This supports the EasService design.
Yes, I just removed a startSync function from this interface last month. No,
I didn't quite know at the time that I'd be adding one back. :)
Change-Id: I19d9c7838473d8982560764fdba0056cba03d132
(cherry picked from commit 4a5b11d650
2014-03-20 00:11:36 +00:00
70cb2878d7
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-19 23:53:28 +00:00
701134953e
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-03-19 23:51:14 +00:00
c90680915d
Merge "Fix setup flow dialog dismissal" into ub-mail-master
2014-03-19 23:35:36 +00:00
f679cd08d1
Delete unused functions from IEmailService.aidl.
...
Change-Id: I131d2d3436a50c94d664fc57c6514481d9afbc97
(cherry picked from commit 8ff6c107867bc2044ba50cad010dbf4a2e93436e)
2014-03-19 22:35:47 +00:00
254dde761f
Fix setup flow dialog dismissal
...
Also remove redundant ok/cancel strings
b/13512724
Change-Id: Idfc7745fbf6a08f09051eb4a6154fc446b43eb67
2014-03-19 15:23:56 -07:00
cc82c7bae2
Fix IME "Next" button handling in credentials screen
...
b/13544867
Change-Id: I63ba680a5551dd4bd860026b9110b20a2ae080b6
2014-03-19 11:13:04 -07:00
e93b81a51a
Merge "Fix back button handling on protocol choice screen" into ub-mail-master
2014-03-19 17:25:47 +00:00
b5a4433798
Fix back button handling on protocol choice screen
...
b/13543514
Change-Id: I27078220aca60ac5137fc69e34e52937313602c9
2014-03-19 10:09:24 -07:00
d90643c732
Move credential population to after we collect credentials
...
b/13512724
Change-Id: I2df8064fc392a928d77291aa41630e4715bedc39
2014-03-18 16:46:33 -07:00
452744474a
Fix broken tests and remove dead code
...
Change-Id: I3ae31c604c86641622f997915dc7d86bf2c662a2
2014-03-18 13:57:11 -07:00
ae980cd685
Account setup flow: Move button and headline handling into fragments
...
b/13508015
Change-Id: I9f7a09467fbee5a57985f36eaa47c2cc7b9d4086
2014-03-17 16:45:47 -07:00
7fbf3ac6d1
Merge "Skip protocol choice if user entered from system account manager" into ub-mail-master
2014-03-14 23:11:37 +00:00
Anthony Lee