summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Some more cleanup and code rearrangement & added unit testsAnthony Lee2014-06-051-282/+336
| | | | | | | | | | | | | | | | | | | | | | | | for ServiceCallback. Change-Id: I6017e50455df3dda9ef6ec54ffd4fbc4e9b1a2d9
* | | | Clean up cert activity handlingTony Mantler2014-06-052-6/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | Fix re-displaying the dialog on orientation change b/5622284 Add host/port when available b/4988512 Disambiguate intent between AOSP and EmailGoogle Change-Id: Ideeda20dfd9bd0070998ccf42d8042765866ca0e
* | | Merge ""No quick responses available" should display when all quick ↵James Lemieux2014-05-301-14/+24
|\ \ \ | | | | | | | | | | | | responses are deleted" into ub-mail-master
| * | | "No quick responses available" should display when all quick responses are ↵James Lemieux2014-05-301-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Change IEmailService.sync to have two different forms" into ↵Martin Hibdon2014-05-302-4/+13
|\ \ \ \ | | | | | | | | | | | | | | | ub-mail-master
| * | | | Change IEmailService.sync to have two different formsMartin Hibdon2014-05-302-4/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8e770154d6116b02746cbdfb8c7cdc9358398de
* | | | | Merge "Cleanup of AttachmentService code and enabling of DownloadQueue." ↵Anthony Lee2014-05-301-590/+507
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into ub-mail-master
| * | | | | Cleanup of AttachmentService code and enabling of DownloadQueue.Anthony Lee2014-05-301-590/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 4e6aa252: Merge "Support hooks for new contact photo source." into ↵Andrew Sapperstein2014-05-281-3/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | ub-gmail-ur13-dev * commit '4e6aa25286d9971e9574d5e3470ad99a15cf93ce': Support hooks for new contact photo source.
| * | | | Merge "Support hooks for new contact photo source." into ub-gmail-ur13-devAndrew Sapperstein2014-05-281-3/+4
| |\ \ \ \
| | * | | | Support hooks for new contact photo source.Andrew Sapperstein2014-05-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/11387812 Change-Id: If081d58941dca0a330905dc2d80148df336995d5
* | | | | | Fix NPE in setAccountPolicyJay Shrauner2014-05-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for null returned by Account.restoreAccountWithId as with other places where it is called. Bug:15286267 Change-Id: I56d59564a1fa814f5c52b44c12303014eea2b0b0
* | | | | | Disambiguate settings intentsTony Mantler2014-05-223-5/+9
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | b/13325901 Change-Id: I2843a6bfdac4acbabc758ddc44f1d980b7036aef
* | | | | Merge "Revert "Get rid of deleteAccountPIMData from IEmailService"" into ↵Martin Hibdon2014-05-213-3/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ub-mail-master
| * | | | | Revert "Get rid of deleteAccountPIMData from IEmailService"Martin Hibdon2014-05-213-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cf2178c4fa61538f5a2f862fe3f9bc16b9f06ebb. Change-Id: I9b05dd7a29a2d2edf64529ca28e2305737a43115
* | | | | | Merge "Get rid of deleteAccountPIMData from IEmailService" into ub-mail-masterMartin Hibdon2014-05-213-19/+3
|\| | | | |
| * | | | | Get rid of deleteAccountPIMData from IEmailServiceMartin Hibdon2014-05-213-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Sanitize HTML email bodies in Android Email" into ub-mail-masterJames Lemieux2014-05-212-1/+10
|\ \ \ \ \ \
| * | | | | | Sanitize HTML email bodies in Android EmailJames Lemieux2014-05-202-1/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Remove unused constant" into ub-mail-masterTony Mantler2014-05-211-3/+0
|\ \ \ \ \ \
| * | | | | | Remove unused constantTony Mantler2014-05-211-3/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/15133133 Change-Id: Ia89829e796dadf48f0257adb994c7102b7d30baf
* | | | | | Merge "Test encode/decode of attachments" into ub-mail-masterTony Mantler2014-05-211-27/+50
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Test encode/decode of attachmentsTony Mantler2014-05-211-27/+50
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | b/15089448 Change-Id: Ifd2afcfb36c9820c5d64ebbcc3230603b2a27089
* / / / / Factored out Watchdog code and cleaned up other stuff.Anthony Lee2014-05-201-138/+193
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Add missing space in MIME headerTony Mantler2014-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also skip adding the filename if none exists b/13138456 Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
* | | | am cd4a94b7: Dependent change caused by refactor of FolderSelectorsJin Cao2014-05-191-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'cd4a94b7e1ff89961c422682d562149744dac0e7': Dependent change caused by refactor of FolderSelectors
| * | | Dependent change caused by refactor of FolderSelectorsJin Cao2014-05-191-3/+3
| |/ / | | | | | | | | | | | | | | | b/9174917 Change-Id: I1d644fe52b3b3e0c3428c6007d4c591a87a45e6c
* | | Fix the remainder of save-alert casesTony Mantler2014-05-152-2/+2
| | | | | | | | | | | | | | | | | | b/14969455 Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
* | | am 4b5b7886: Merge "Disable the debug menu" into ub-mail-algolMartin Hibdon2014-05-151-9/+13
|\ \ \ | | |/ | |/| | | | | | | * commit '4b5b7886bc91c27688387ae00e552ad8540eb3e7': Disable the debug menu
| * | Disable the debug menuMartin Hibdon2014-05-151-9/+13
| | | | | | | | | | | | | | | | | | b/14995079 Change-Id: I0b7fa2edc7cf7cdac97aba9412a18aece09cb5c2
| * | DO NOT MERGE Fix URI comparisonTony Mantler2014-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 e8a3c14f28bac4912842761b04c96272caf52810)
| * | Fix cancel handling in account settings screensTony Mantler2014-05-084-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 294593c5f592f4eec6994909cca60450936a0812)
* | | Merge "Move email bodies to files" into ub-mail-masterTony Mantler2014-05-154-166/+396
|\ \ \
| * | | Move email bodies to filesTony Mantler2014-05-144-166/+396
| | |/ | |/| | | | | | | Change-Id: Icfd0c4ab2ad25cc02b45cf41e7a205c17948ef2c
* | | Merge "Fix FLAG_OAUTH usage" into ub-mail-masterTony Mantler2014-05-152-3/+5
|\ \ \
| * | | Fix FLAG_OAUTH usageTony Mantler2014-05-142-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some excessive checking of incoming/outgoing settings fragments b/14969455 b/14971192 Change-Id: I6cf83aa59d381d3bbfc33e0d4a6e133c1814ba69
* | | | Stop EmailProvider from zealously and uselessly notifying of changesJames Lemieux2014-05-142-6/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Move account backup/restore to userdata in AccountManagerTony Mantler2014-05-141-74/+66
| | | | | | | | | | | | Change-Id: Iea9f2a1b1f2d87e07d63cbb1df5a0d6355ea4031
* | | Merge "Fix URI comparison" into ub-mail-masterTony Mantler2014-05-141-2/+2
|\ \ \
| * | | Fix URI comparisonTony Mantler2014-05-141-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* / / Introduction of DownloadQueue and associated tests.Anthony Lee2014-05-121-138/+283
|/ / | | | | | | | | | | Also a bit of cleanup around log tags and DownloadRequest. Change-Id: I33221f099ed691e5258e1741cf0a63381404f520
* | Fetch email bodies using ContentResolver#openInputStreamTony Mantler2014-05-084-127/+132
| | | | | | | | | | | | | | This brings us further along the path to storing email bodies outside of the database. Change-Id: I96296114ade0d561df724878ed92999306bcd176
* | Create separate thread pool for EmailMessageCursorJames Lemieux2014-05-071-1/+31
| | | | | | | | | | | | | | | | 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
* | Clean up loggingTony Mantler2014-05-061-24/+22
| | | | | | | | | | | | b/14590064 Change-Id: Ib841ebecae339690c143eaf356eced58d9ac5372
* | Null check EmailServiceInfoTony Mantler2014-05-051-3/+10
| | | | | | | | | | | | b/14567915 Change-Id: I4780835a7f195f1a825a1538f9f1b939e2be4214
* | am 81f9a57a: Fix some STOPSHIP loggingMartin Hibdon2014-05-054-9/+6
|\| | | | | | | | | * commit '81f9a57a655fe842ddd86b14afe75bcd575edb81': Fix some STOPSHIP logging
| * Fix some STOPSHIP loggingMartin Hibdon2014-05-054-9/+6
| | | | | | | | | | | | b/14564870 Change-Id: I9365013eacde23178578b45f728713f80417bc7a
* | Escape string values passed into SQLTony Mantler2014-05-051-1/+1
| | | | | | | | | | | | b/14562987 Change-Id: Ibefd8d1d7418fffe4467abdae0cf978228d303a0
* | resolved conflicts for merge of 0d7c7091 to ub-mail-masterTony Mantler2014-05-011-7/+36
|\| | | | | | | Change-Id: Id754089f16146daf0c07f77208d55c2406c997c5
| * Always return a valid Uri for account inboxTony Mantler2014-05-011-7/+36
| | | | | | | | | | | | | | | | Also don't return virtual folders unless real folders exist b/14319452 Change-Id: Id5f62f5ccc4d5488ae467df741b0598a158ceb81