Makoto Onuki
aeffc9f32c
am e16b6a6b
: am 61e63111
: Show account name on error banner
...
* commit 'e16b6a6ba19c482cb3c70c5247abeeac9e79261f':
Show account name on error banner
2011-01-25 14:15:59 -08:00
Makoto Onuki
e16b6a6ba1
am 61e63111
: Show account name on error banner
...
* commit '61e63111ba71b7f70f76079812dfc858b398fa80':
Show account name on error banner
2011-01-25 14:13:29 -08:00
Makoto Onuki
61e63111ba
Show account name on error banner
...
For now just show the account name in parens. I'll ask the design
team for a better layout.
(I don't want to change code too much at this point, so didn't add a
new view for the account name.)
Bug 3366546
Change-Id: I3a5314be4bdfacc2720093511eb03571e91fa963
2011-01-25 13:21:04 -08:00
Eric Fischer
f47e0391cc
am 808d0f38
: (-s ours) Import translations for additional languages.
...
* commit '808d0f38a6ddec267b86158fe9b7847436f81bc7':
Import translations for additional languages.
2011-01-25 12:53:12 -08:00
Todd Kennedy
beec60d775
am b82239c1
: am adbd22c9
: Merge "Infer attachment\'s mime type if it\'s text/plain" into honeycomb
...
* commit 'b82239c192dc86ebe7f986e025ca5d392a6e3e51':
Infer attachment's mime type if it's text/plain
2011-01-25 10:42:18 -08:00
Todd Kennedy
b82239c192
am adbd22c9
: Merge "Infer attachment\'s mime type if it\'s text/plain" into honeycomb
...
* commit 'adbd22c9bed1e45e26130f32a684aa29676537dc':
Infer attachment's mime type if it's text/plain
2011-01-25 10:40:08 -08:00
Makoto Onuki
917b28ddc1
am 893f79c7
: am 5cba7259
: Merge "Remove STOPSHIP for error banner" into honeycomb
...
* commit '893f79c77189a1ba895071fb3339de81bca09aab':
Remove STOPSHIP for error banner
2011-01-25 10:38:13 -08:00
Todd Kennedy
adbd22c9be
Merge "Infer attachment's mime type if it's text/plain" into honeycomb
2011-01-25 10:36:36 -08:00
Makoto Onuki
893f79c771
am 5cba7259
: Merge "Remove STOPSHIP for error banner" into honeycomb
...
* commit '5cba72594040e5fbfa53c6b1f72b01632949c87f':
Remove STOPSHIP for error banner
2011-01-25 10:35:59 -08:00
Makoto Onuki
5cba725940
Merge "Remove STOPSHIP for error banner" into honeycomb
2011-01-25 10:33:43 -08:00
Makoto Onuki
931370a340
Remove STOPSHIP for error banner
...
We'll go with the current design for now.
Bug 3335095
Change-Id: Iaac0e5933fb534d547ebbf90315cea628e8f49cc
2011-01-25 10:19:03 -08:00
Todd Kennedy
14546a6b00
am 377985cb
: am b3740d22
: Merge "Only show loaded messages in widget" into honeycomb
...
* commit '377985cb5df13d9132d0af02bd8001e79cf8068b':
Only show loaded messages in widget
2011-01-25 10:11:16 -08:00
Todd Kennedy
377985cb5d
am b3740d22
: Merge "Only show loaded messages in widget" into honeycomb
...
* commit 'b3740d227ee0eede878d97654d180f781d591da0':
Only show loaded messages in widget
2011-01-25 10:09:15 -08:00
Todd Kennedy
b3740d227e
Merge "Only show loaded messages in widget" into honeycomb
2011-01-25 10:06:51 -08:00
Andy Stadler
5c8ec71e4a
am 7ab349f9
: am 9128217d
: Merge forward small bug found in password storage
...
* commit '7ab349f9710732de25c7cbd4ae6e911baa85efc5':
Merge forward small bug found in password storage
2011-01-25 10:01:14 -08:00
Andy Stadler
7ab349f971
am 9128217d
: Merge forward small bug found in password storage
...
* commit '9128217da1f8ae53f1c44f369934ff075ae5057b':
Merge forward small bug found in password storage
2011-01-25 09:58:00 -08:00
Todd Kennedy
34212cc7df
Infer attachment's mime type if it's text/plain
...
If the server reports an attachment's mime type as either text/plain or
application/octet-stream, we will try to infer the real mime type using
the attachment's extension. If one cannot be found, we either synthesize
it (if original mime type is application-octet-stream), or, we use the
server specified mime type (if the original is text/plain).
bug 3379416
Change-Id: I331e767ed36e4e17756025cc816bdb7b5a8f0868
2011-01-25 09:55:15 -08:00
Todd Kennedy
543953ad87
Only show loaded messages in widget
...
The various selection strings were missing a test to only show messages that
have been loaded. This is only important for POP3 accounts.
bug 3377041
Change-Id: I3efe366d09dd547878dc0bf57dff58f76de5cca9
2011-01-25 09:42:04 -08:00
Andy Stadler
9128217da1
Merge forward small bug found in password storage
...
While fixing bug 2981433 in Gingerbread, I discovered one additional
place where passwords were being trimmed. This brings the fix forward
into honeycomb, as well as a new unit test for the fix.
Bug: 2981433
Change-Id: I566f5c0c6693ca7c0069bca9e74f320fca48e600
2011-01-24 20:13:11 -08:00
Andy Stadler
1d4726ac73
am 18b73106
: am 24a81185
: Merge "Catch base64 errors and handle in-place" into honeycomb
...
* commit '18b7310684e3baf9d2bde91c2c1fabcf8aadb134':
Catch base64 errors and handle in-place
2011-01-24 19:42:45 -08:00
Andy Stadler
18b7310684
am 24a81185
: Merge "Catch base64 errors and handle in-place" into honeycomb
...
* commit '24a81185d1006a95b96561bfd5bc3f8c5669bdcb':
Catch base64 errors and handle in-place
2011-01-24 19:39:13 -08:00
Marc Blank
e09eb93b31
am b802246f
: am 3ef8f54b
: Prefetch respects "background data" setting and waits for connectivity
...
* commit 'b802246f99c0fe964aefbc06b9e4a9056c2a9fc4':
Prefetch respects "background data" setting and waits for connectivity
2011-01-24 19:37:14 -08:00
Andy Stadler
24a81185d1
Merge "Catch base64 errors and handle in-place" into honeycomb
2011-01-24 19:33:18 -08:00
Marc Blank
b802246f99
am 3ef8f54b
: Prefetch respects "background data" setting and waits for connectivity
...
* commit '3ef8f54bae6a3e02919cfd7add7ed6bf7fdda901':
Prefetch respects "background data" setting and waits for connectivity
2011-01-24 19:32:48 -08:00
Marc Blank
3ef8f54bae
Prefetch respects "background data" setting and waits for connectivity
...
Bug: 3384997
Bug: 3384994
Change-Id: Id8338650b69666f2996837324e27c2e98c9261fe
2011-01-24 18:39:50 -08:00
Andy Stadler
980c2256f1
Catch base64 errors and handle in-place
...
Bug: 3362752
Change-Id: I63adb8663c90a7710176cc1c481bbfa5b4b859c4
2011-01-24 18:06:53 -08:00
Todd Kennedy
3c66c31396
am df67c5d8
: am 48be275b
: Merge "Prevent auto-download of attachments not in an inbox" into honeycomb
...
* commit 'df67c5d8a002d81df4091eda62b6eeac4084a76f':
Prevent auto-download of attachments not in an inbox
2011-01-24 14:25:18 -08:00
Todd Kennedy
df67c5d8a0
am 48be275b
: Merge "Prevent auto-download of attachments not in an inbox" into honeycomb
...
* commit '48be275bbb05dcb9a60504b26e89648b5b98c5f5':
Prevent auto-download of attachments not in an inbox
2011-01-24 14:22:57 -08:00
Todd Kennedy
48be275bbb
Merge "Prevent auto-download of attachments not in an inbox" into honeycomb
2011-01-24 14:20:37 -08:00
Eric Fischer
c7ea1d0684
am 7ec5d58d
: (-s ours) am 46e848cc
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '7ec5d58d4007c0363a1a0f5125b6cc386cad00a6':
Import revised translations. DO NOT MERGE
2011-01-24 14:01:22 -08:00
Eric Fischer
7ec5d58d40
am 46e848cc
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '46e848ccadf6217e365916d07c9b715dac9beabb':
Import revised translations. DO NOT MERGE
2011-01-24 13:58:17 -08:00
Eric Fischer
46e848ccad
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-24 13:52:21 -08:00
Andy Stadler
0eb48fd0c4
am 3ac11f1e
: am 4fd1ebdc
: Fix multiline mode in signature
...
* commit '3ac11f1e65eca4801c12d825ac41754c2d1ea827':
Fix multiline mode in signature
2011-01-24 13:46:48 -08:00
Andy Stadler
3ac11f1e65
am 4fd1ebdc
: Fix multiline mode in signature
...
* commit '4fd1ebdcc3b8b1389c65e485d73cd5a98616cf17':
Fix multiline mode in signature
2011-01-24 13:44:10 -08:00
Todd Kennedy
751e4b2d95
Prevent auto-download of attachments not in an inbox
...
When creating the list of attachments to be automatically downloaded in the
background, exclude any attachments that are not in an inbox. Also added unit
tests to ensure the query URIs behave as expected.
NOTE: This is a partial fix for general background attachment downloading issues
bug 3373982
Change-Id: I13ef56cd280c028fa966ab9e655acce28b0b9b91
2011-01-24 13:43:14 -08:00
Andy Stadler
370e838849
am d27516d8
: am 3dc2fcaa
: Merge "Rework account security bootstrap procedure" into honeycomb
...
* commit 'd27516d8569f118c00ab923891584407cec696fb':
Rework account security bootstrap procedure
2011-01-24 13:31:49 -08:00
Todd Kennedy
bb34a895b7
am eeabcedb
: am 819db01e
: Limit attachment background download attempts
...
* commit 'eeabcedbbc9ec4cae10974805d61d60b6b39d43c':
Limit attachment background download attempts
2011-01-24 13:31:04 -08:00
Eric Fischer
d71bb44960
Import revised translations. DO NOT MERGE
...
Change-Id: I9bfa9efb92f8051335f55bc5a898eff8ffe9c7fe
2011-01-24 12:38:12 -08:00
Andy Stadler
4fd1ebdcc3
Fix multiline mode in signature
...
* Add multiline flag to preference xml
* Also, remove display of actual signature in summary, as it
does not properly handle long or multiline signatures.
Bug: 3379235
Change-Id: I84894dbdccee2cd8a8ece05d0b8f7fdcf7b92406
2011-01-24 12:01:43 -08:00
Andy Stadler
d27516d856
am 3dc2fcaa
: Merge "Rework account security bootstrap procedure" into honeycomb
...
* commit '3dc2fcaac356d2e3866c860199e1d51a8a087f98':
Rework account security bootstrap procedure
2011-01-24 11:20:59 -08:00
Andy Stadler
3dc2fcaac3
Merge "Rework account security bootstrap procedure" into honeycomb
2011-01-24 11:18:12 -08:00
Todd Kennedy
eeabcedbbc
am 819db01e
: Limit attachment background download attempts
...
* commit '819db01eadc3a95b02b2f820b483056b68c631f0':
Limit attachment background download attempts
2011-01-24 11:16:11 -08:00
Andy Stadler
45bfac00e5
Rework account security bootstrap procedure
...
* Bug to fix was that it was looping if the user canceled
password or encryption setup (instead of simply re-notifying.)
* Solution was to refactor all code into a single sequence of checks,
rerun the sequence each time, and set markers to prevent looping.
* Rework needed after the changes in I54f39bc9 which added
encryption support but introduced the looping behavior.
* Removed a UI-thread DB access
Bug: 3346641
Change-Id: I0791d7a16287efecc7121b5ffa0db26ca2b05151
2011-01-24 11:08:31 -08:00
Todd Kennedy
819db01ead
Limit attachment background download attempts
...
Do not retry downloading attachments infinitely. After some number of failures,
black list the attachment and move on. The black list is not persisted, so,
restarting the app will again try to fetch the attachments. In this way, any
transient network failures will not permanently affect the ability to download
attachments in the background
NOTE: This is a partial fix for general background attachment downloading issues
bug 3373982
Change-Id: I7f3ad9667ebebb95fbba95278b62bf40c5fce67c
2011-01-24 10:19:46 -08:00
Marc Blank
2760374f7d
am c93cf5d6
: am 5150d0e8
: Merge "Don\'t require sSyncLock for sync error map" into honeycomb
...
* commit 'c93cf5d6797d80a6ac3a461d8630385105f78df8':
Don't require sSyncLock for sync error map
2011-01-23 17:00:24 -08:00
Marc Blank
8818e4f472
am 2d9a2186
: am d6fbab1e
: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb
...
* commit '2d9a2186b883863a34378e0d62799ea1338ac2ce':
Prevent logging about "attachment with null contentUri"
2011-01-23 17:00:21 -08:00
Dianne Hackborn
91bee2345e
am f5adc395
: am 2b59ecae
: Remove use of old theme name.
...
* commit 'f5adc3955cf3d8ac6af06898cf14b8e145188c88':
Remove use of old theme name.
2011-01-23 16:50:28 -08:00
Marc Blank
c93cf5d679
am 5150d0e8
: Merge "Don\'t require sSyncLock for sync error map" into honeycomb
...
* commit '5150d0e818174453656069eeb4f282b6293b0abc':
Don't require sSyncLock for sync error map
2011-01-23 15:07:11 -08:00
Marc Blank
2d9a2186b8
am d6fbab1e
: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb
...
* commit 'd6fbab1e7a51852f13c343e8a0325f81c19d98c5':
Prevent logging about "attachment with null contentUri"
2011-01-23 15:05:14 -08:00
Marc Blank
5150d0e818
Merge "Don't require sSyncLock for sync error map" into honeycomb
2011-01-23 15:04:30 -08:00