Commit Graph

4574 Commits

Author SHA1 Message Date
Anthony Lee
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
Tony Mantler
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
Tony Mantler
f501d41c7b Merge "Add cross-fade to setup flow" into ub-mail-algol 2014-04-18 22:37:32 +00:00
Tony Mantler
b5fd6b8905 Add cross-fade to setup flow
b/14164262

Change-Id: I41fe0bf5661d9f7a2b5051604c0b6dbfc4506414
2014-04-18 14:54:55 -07:00
Tony Mantler
42a4dbbf93 Refactor addMailbox() a bit and clean up warnings
Change-Id: I8497f74ec61c380ae4e69487121c50933f568965
2014-04-18 14:28:28 -07:00
Tony Mantler
3c73a04bec Continue purging the unused reply parts
Change-Id: I47b5bbe50ba36e68ad7ba80647f401b992660ba1
2014-04-18 14:04:23 -07:00
Tony Mantler
f0db9ce9ab Clean up LegacyConversions
Change-Id: I9cb9bf8a08663004a497af9f52e3ab0647bd2168
2014-04-18 13:36:18 -07:00
Tony Mantler
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
Tony Mantler
1c594b8050 Make AccountSettings implement callbacks for check settings dialog
b/14120112

Change-Id: I9834a772e90d2d13f16a84a70651286759bc9dbc
2014-04-18 11:16:57 -07:00
Tony Mantler
502f6ad7ea Tidy up saveAttachmentBody
Change-Id: I1852ad7d94eec15feb661a87f81869a554d595af
2014-04-17 16:19:23 -07:00
Tony Mantler
fd69e5b036 Purge unused/obsolete body fields
Change-Id: Idafa09b58f5753e4cb3cad754c861cc8e3d80c34
2014-04-17 14:32:10 -07:00
Tony Mantler
0e26184ac7 am 6529f2c9: Add some null-checks
* commit '6529f2c99d24f0dd801ed142ce946b46c92d5e9f':
  Add some null-checks
2014-04-17 18:56:23 +00:00
Tony Mantler
6529f2c99d Add some null-checks
b/14117436
b/14120112

Change-Id: I0f56e036ec1a78887523d90ab4e6cda3a05accdf
2014-04-17 11:50:25 -07:00
Andrew Sapperstein
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
Tony Mantler
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
Andrew Sapperstein
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
Tony Mantler
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
Tony Mantler
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
Tony Mantler
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
Tony Mantler
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
Tony Mantler
75d60f045b Merge "Null check mCheckFrequency before using" into ub-mail-algol 2014-04-16 17:17:15 +00:00
Tony Mantler
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
Tony Mantler
0151a6af62 Null check mCheckFrequency before using
b/14091609

Change-Id: I796774b7133ec68382d2580d0b1cde347aa143f8
2014-04-16 10:11:55 -07:00
Tony Mantler
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
Tony Mantler
204982897b Merge "Bypass the cursor window for email bodies" into ub-mail-master 2014-04-15 22:43:57 +00:00
Tony Mantler
f678a18b69 Bypass the cursor window for email bodies
b/11787468

Change-Id: Iba5faa5b825357144d07ec4dfcf010c6af50496d
2014-04-15 15:18:17 -07:00
Scott Kennedy
90118635a9 am 1f4d6e9a: Use the correct R import
* commit '1f4d6e9aa9f6f219f14951e2966043ac379e262c':
  Use the correct R import
2014-04-15 22:06:45 +00:00
Scott Kennedy
1f4d6e9aa9 Use the correct R import
Change-Id: I087087079a47df7693dbec662d53dc73f7bcba43
2014-04-15 14:49:41 -07:00
Tony Mantler
3dd85723a1 Cleanup in EmailContent
Change-Id: Ifa251eb206779f59ea003f99395d454c7e407bc2
2014-04-14 12:54:39 -07:00
Andy Huang
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
Martin Hibdon
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
Martin Hibdon
2172ac410a Merge "Correctly initialize the authentication view" into ub-mail-algol 2014-04-10 23:09:46 +00:00
Tony Mantler
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
Martin Hibdon
12e7d101e8 Correctly initialize the authentication view
b/13961322

Change-Id: I96067b30c54131cc65a0282b118f9821d363113b
2014-04-10 16:01:06 -07:00
Tony Mantler
c83366c887 Fix some crashes and misbehavior with account settings screens
b/13954490

Change-Id: Ic81b342495a46573cb1fe78cad1f4888fffc4ae8
2014-04-10 15:28:15 -07:00
Tony Mantler
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
Tony Mantler
bae63123ec Merge "Move EmailConversationCursor out of EmailProvider" into ub-mail-master 2014-04-09 22:32:21 +00:00
Tony Mantler
0053401d07 Move EmailConversationCursor out of EmailProvider
Also tidy warnings in EmailProvider

Change-Id: Ib41011cc4b43adf0272be22bc7c054a99ff58309
2014-04-09 14:20:08 -07:00
Martin Hibdon
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
Martin Hibdon
d896fa8a2e Merge "Fix an NPE in sendCommandInternal" into ub-mail-algol 2014-04-09 20:12:24 +00:00
Tony Mantler
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
Martin Hibdon
2a7411b57b Fix an NPE in sendCommandInternal
b/13929234

Change-Id: I362682bde3c24123178e68811604f0180c853598
2014-04-09 11:22:52 -07:00
Tony Mantler
9d06daa803 Increase padding above labels in setup flow
b/13640327

Change-Id: I54e98855566adc45dcd410186c2e7ea322dc1a58
2014-04-09 11:16:46 -07:00
Tony Mantler
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
Tony Mantler
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
Tony Mantler
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
Tony Mantler
84366ae273 Merge "Fix attachment loading for messages which have been forwarded" into ub-mail-algol 2014-04-08 22:17:56 +00:00
Martin Hibdon
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
Martin Hibdon
d58b490479 Fix a potential stack overflow error
b/13906567

Change-Id: I21be980d4b4878ada0df6d3af706fee55afb4f2b
2014-04-08 14:35:53 -07:00
Tony Mantler
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