Commit Graph

4370 Commits

Author SHA1 Message Date
Justin Ho
b47abbc282 am 34d178b0: Merge "Updated contact picture" into honeycomb
* commit '34d178b0c9a772e4b43abe6d7e3c8865c08c0a13':
  Updated contact picture
2011-01-25 18:34:08 -08:00
Justin Ho
34d178b0c9 Merge "Updated contact picture" into honeycomb 2011-01-25 18:32:02 -08:00
Justin Ho
c2cc179a04 Updated contact picture
Change-Id: Ie1def88c913dd8893cac1ef66f376287ba5ab6a8
2011-01-25 18:25:11 -08:00
Makoto Onuki
0f02170b40 am c8504852: Remove STOPSHIPs
* commit 'c850485269b685c49a36500d583cbe38635d59cc':
  Remove STOPSHIPs
2011-01-25 17:27:43 -08:00
Makoto Onuki
c850485269 Remove STOPSHIPs
action_bar_current_mailbox: We'll ship with the current design.
colors.xml: Obsolete STOPSHIP.

Bug 3335095

Change-Id: Ic45ef3d0cafb55761b720e1e74c0633012f87e98
2011-01-25 16:37:40 -08:00
Makoto Onuki
b945735958 am 2d0e44f2: Fix NPE in AttachmentDownloadService
* commit '2d0e44f201f4f50e3e3416285805c8f28d1d6ed8':
  Fix NPE in AttachmentDownloadService
2011-01-25 15:41:37 -08:00
Makoto Onuki
2d0e44f201 Fix NPE in AttachmentDownloadService
Initialize mConnectivityManager before starting the thread.

Bug 3389701

Change-Id: If616721ad3b3bec81c5d6920f4a5d91b06f937fb
2011-01-25 15:30:15 -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
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
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
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
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
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
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
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
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
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
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
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
Marc Blank
d6fbab1e7a Merge "Prevent logging about "attachment with null contentUri"" into honeycomb 2011-01-23 15:03:10 -08:00
Dianne Hackborn
f5adc3955c am 2b59ecae: Remove use of old theme name.
* commit '2b59ecaebcc8012d307080f3f345692fa94e679e':
  Remove use of old theme name.
2011-01-23 14:41:35 -08:00
Dianne Hackborn
2b59ecaebc Remove use of old theme name.
Change-Id: I0a08171b3068abeb57c973074b37aaf3c87ff001
2011-01-23 13:06:41 -08:00
Makoto Onuki
2aee3a1002 am 04cf5e4b: Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb
* commit '04cf5e4bdf091f490f2e3bfb40f80bab44a05e25':
  AttachmentProvider: Always return mime-types in lowercase
2011-01-23 11:38:28 -08:00
Makoto Onuki
04cf5e4bdf Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb 2011-01-23 11:32:28 -08:00
Marc Blank
1264651c69 Prevent logging about "attachment with null contentUri"
Bug: 3373982
Change-Id: I41b655041d5c244484435fe5bab7649d9ca569eb
2011-01-22 13:55:14 -08:00
Marc Blank
2fabab32b9 Don't require sSyncLock for sync error map
* Use ConcurrentHashMap; check that this provides enough protection
  for all uses
* This resolves known deadlock issues in ExchangeService

Bug: 3371039

Change-Id: Ie4ccbe7cdfe8c3d4ec7a0f789409126c8c09f8c4
2011-01-21 18:14:04 -08:00
Andy Stadler
a01c510146 am 5211161a: (-s ours) am ecffd551: DO NOT MERGE Remove all password trim() calls
* commit '5211161a887c6a446a275e44eb76b4207b18122e':
  DO NOT MERGE Remove all password trim() calls
2011-01-21 17:41:21 -08:00
Todd Kennedy
c8e5a4bc61 am f92dd2bf: Don\'t display toast for background download failures
* commit 'f92dd2bf3ea445db9b9a0eb9a447b5cbdb1a6e05':
  Don't display toast for background download failures
2011-01-21 15:35:38 -08:00