Commit Graph

1264 Commits

Author SHA1 Message Date
Android (Google) Code Review
e1b5e8574c Merge change I2b0e3b10 into eclair
* changes:
  Help with another push inconsistency edge case (#2131432)
2009-10-06 20:16:52 -04:00
Eric Fischer
0aba41f98b Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-06 16:52:58 -07:00
Andrew Stadler
a79aab29ea am aa32726d: am eb7752bf: Fix back-to-back message-id bugs
Merge commit 'aa32726d8b0001bfdd9498d9ecc4459f1aa3fc70' into eclair-mr2-plus-aosp

* commit 'aa32726d8b0001bfdd9498d9ecc4459f1aa3fc70':
  Fix back-to-back message-id bugs
2009-10-06 15:18:27 -07:00
Mihai Preda
3a56fec872 am 37aa2744: am 85d718cb: MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Merge commit '37aa27440bd3d73c9720252078b7507f5be480b1' into eclair-mr2-plus-aosp

* commit '37aa27440bd3d73c9720252078b7507f5be480b1':
  MessageCompose: quote plain-text body if available, otherwise quote HTML body.
2009-10-06 15:18:23 -07:00
Andrew Stadler
aa32726d8b am eb7752bf: Fix back-to-back message-id bugs
Merge commit 'eb7752bf695b2a93854e0bb89ddbbc2236bb9aea' into eclair-mr2

* commit 'eb7752bf695b2a93854e0bb89ddbbc2236bb9aea':
  Fix back-to-back message-id bugs
2009-10-06 14:36:51 -07:00
Mihai Preda
37aa27440b am 85d718cb: MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Merge commit '85d718cb0735de9069673fbf9834fa64459c2178' into eclair-mr2

* commit '85d718cb0735de9069673fbf9834fa64459c2178':
  MessageCompose: quote plain-text body if available, otherwise quote HTML body.
2009-10-06 14:36:47 -07:00
Andrew Stadler
eb7752bf69 Fix back-to-back message-id bugs
* MessageCompose now adds message-id to new messages (it was previously
    done on its behalf by MimeMessage).
* LegacyConversions.updateMessageFields() now handles missing message-id
    without error.
* Unit tests for the LegacyConversions change

These two issues were combining with a failure of comcast's SMTP server
to insert message-id headers, to prevent delivery of a message between
any two comcast accounts using this client.

Bug # http://b/issue?id=2161478
2009-10-06 14:20:09 -07:00
Marc Blank
ffef9d9fe8 Help with another push inconsistency edge case (#2131432)
* If we are forced to abort a "ping" due to a watchdog alarm, we should
  handle this as a ping failure (which potentially changes the heartbeat)
  rather than a garden variety IOException.
* This prevents the additional overhead of connection error backoffs,
  which would only tend to increase the time needed to recover from the
  error.
* In one case reported by Moto, this appears to be the behavior of a WiFi
  router with NAT timeout.  This fix will cause maximum delay for pushed
  mail to be reduced in most cases.

Change-Id: I2b0e3b10d82762d20f63cac3ac4638a03f13f842
2009-10-06 13:46:09 -07:00
Marc Blank
5b2a84472e am 25c7efc8: Use constants for elements in projections.
Merge commit '25c7efc8eb496136b734349babf463f3edcc6edb' into eclair-mr2-plus-aosp

* commit '25c7efc8eb496136b734349babf463f3edcc6edb':
  Use constants for elements in projections.
2009-10-06 08:37:05 -07:00
Marc Blank
25c7efc8eb Use constants for elements in projections.
Change-Id: I304e03da4419b4e7166189e08e4ce947c5f74383
2009-10-06 08:30:30 -07:00
Mihai Preda
17d0710277 am 8b003de7: am 1ef86a50: MessageView: scroll to (0,0) on message change.
Merge commit '8b003de7adc059d87da3268b9e3a06bc68eabada' into eclair-mr2-plus-aosp

* commit '8b003de7adc059d87da3268b9e3a06bc68eabada':
  MessageView: scroll to (0,0) on message change.
2009-10-06 07:58:55 -07:00
Mihai Preda
8b003de7ad am 1ef86a50: MessageView: scroll to (0,0) on message change.
Merge commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441' into eclair-mr2

* commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441':
  MessageView: scroll to (0,0) on message change.
2009-10-06 07:53:10 -07:00
Mihai Preda
85d718cb07 MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Bug 2082852.
2009-10-06 16:50:54 +02:00
Mihai Preda
1ef86a50f8 MessageView: scroll to (0,0) on message change.
Bug 2156934.
2009-10-06 16:36:44 +02:00
satok
75e1743874 am c5abc6d6: am d493ba25: Merge change Ie90b74aa into eclair
Merge commit 'c5abc6d636cff216ae1cb1e059ffc6d1ed4b3d69' into eclair-mr2-plus-aosp

* commit 'c5abc6d636cff216ae1cb1e059ffc6d1ed4b3d69':
  Avoid NPE at onRefresh in MessageList
2009-10-05 19:44:24 -07:00
satok
c5abc6d636 am d493ba25: Merge change Ie90b74aa into eclair
Merge commit 'd493ba257a1632a8de578e06a7df7ed311227887' into eclair-mr2

* commit 'd493ba257a1632a8de578e06a7df7ed311227887':
  Avoid NPE at onRefresh in MessageList
2009-10-05 19:39:06 -07:00
Android (Google) Code Review
d493ba257a Merge change Ie90b74aa into eclair
* changes:
  Avoid NPE at onRefresh in MessageList
2009-10-05 22:31:42 -04:00
Marc Blank
5c654c3afd am 89235946: Merge change I89c7c5dd into eclair-mr2
Merge commit '89235946effa76d4b2c285738b2c45c541f54edb' into eclair-mr2-plus-aosp

* commit '89235946effa76d4b2c285738b2c45c541f54edb':
  Add "Do Not Translate" to Debug screen strings (#2163281)
2009-10-05 14:58:18 -07:00
Android (Google) Code Review
89235946ef Merge change I89c7c5dd into eclair-mr2
* changes:
  Add "Do Not Translate" to Debug screen strings (#2163281)
2009-10-05 17:51:46 -04:00
Marc Blank
0b094d6c0f am fd883ca5: am 8647be09: Merge change Id1c0bc24 into eclair
Merge commit 'fd883ca573724e1dc6973f7c43328d7dfd4caf8d' into eclair-mr2-plus-aosp

* commit 'fd883ca573724e1dc6973f7c43328d7dfd4caf8d':
  Correct issue with mail change parsing (fixes #2165649)
2009-10-05 14:14:12 -07:00
Marc Blank
fd883ca573 am 8647be09: Merge change Id1c0bc24 into eclair
Merge commit '8647be095a75a25df98487d6e908a94f2d6fb076' into eclair-mr2

* commit '8647be095a75a25df98487d6e908a94f2d6fb076':
  Correct issue with mail change parsing (fixes #2165649)
2009-10-05 14:07:42 -07:00
Marc Blank
e7e0a8523a Add "Do Not Translate" to Debug screen strings (#2163281)
Change-Id: I89c7c5ddb64fe29ccf29b8ebdf00e136dc5a6d6a
2009-10-05 14:07:42 -07:00
Android (Google) Code Review
8647be095a Merge change Id1c0bc24 into eclair
* changes:
  Correct issue with mail change parsing (fixes #2165649)
2009-10-05 16:59:07 -04:00
Marc Blank
d0848056f1 Correct issue with mail change parsing (fixes #2165649)
* Older parsing code that didn't take into account the fact that
  'flag' is a structured data item
* Requires Dr. No approval for Eclair_Sholes

Change-Id: Id1c0bc24e784b19c598d2b852975e135abebbdb0
2009-10-05 13:58:19 -07:00
Fred Quintana
7ac20eec5a am afe49c7c: am 794b7e92: account manager api review changes
Merge commit 'afe49c7c27153d7fa7c2ea60696055c3677d12d7' into eclair-mr2-plus-aosp

* commit 'afe49c7c27153d7fa7c2ea60696055c3677d12d7':
  account manager api review changes
2009-10-05 11:40:24 -07:00
Fred Quintana
afe49c7c27 am 794b7e92: account manager api review changes
Merge commit '794b7e9258db816aa7097779f20e99878e412eda' into eclair-mr2

* commit '794b7e9258db816aa7097779f20e99878e412eda':
  account manager api review changes
2009-10-05 11:34:09 -07:00
Fred Quintana
794b7e9258 account manager api review changes 2009-10-05 11:29:01 -07:00
Marc Blank
54ac116910 am 5c63b5dd: am 888ea64f: Merge change I26bb7b8b into eclair
Merge commit '5c63b5dde4508d85f91b69abfd126ab6e2d3e245' into eclair-mr2-plus-aosp

* commit '5c63b5dde4508d85f91b69abfd126ab6e2d3e245':
  Handle change from push to other intervals properly (#2165032)
2009-10-05 11:17:26 -07:00
Marc Blank
844389724d am df10dbc2: am 65aae18d: Merge change Iaf15ead1 into eclair
Merge commit 'df10dbc20b374ba225485df3f3739cdc0559e0f5' into eclair-mr2-plus-aosp

* commit 'df10dbc20b374ba225485df3f3739cdc0559e0f5':
  Add patent disclaimer to appropriate directories (#2079270)
2009-10-05 11:17:22 -07:00
Ray Chen
28ef675320 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp 2009-10-05 11:17:17 -07:00
Marc Blank
5c63b5dde4 am 888ea64f: Merge change I26bb7b8b into eclair
Merge commit '888ea64f86e518de18806ef85bc7c16ba29f72f6' into eclair-mr2

* commit '888ea64f86e518de18806ef85bc7c16ba29f72f6':
  Handle change from push to other intervals properly (#2165032)
2009-10-05 11:12:30 -07:00
Marc Blank
df10dbc20b am 65aae18d: Merge change Iaf15ead1 into eclair
Merge commit '65aae18de30be842537d15f7b535243e96071c75' into eclair-mr2

* commit '65aae18de30be842537d15f7b535243e96071c75':
  Add patent disclaimer to appropriate directories (#2079270)
2009-10-05 11:12:26 -07:00
Android (Google) Code Review
888ea64f86 Merge change I26bb7b8b into eclair
* changes:
  Handle change from push to other intervals properly (#2165032)
2009-10-05 14:07:09 -04:00
Marc Blank
86765f3463 Handle change from push to other intervals properly (#2165032)
* Make sure eas account mailbox is also changed to the new sync interval

Change-Id: I26bb7b8b740c09f4c2cf848c33c9b642b9776fcc
2009-10-05 11:05:37 -07:00
Android (Google) Code Review
65aae18de3 Merge change Iaf15ead1 into eclair
* changes:
  Add patent disclaimer to appropriate directories (#2079270)
2009-10-05 14:02:45 -04:00
Marc Blank
c5563407dd Add patent disclaimer to appropriate directories (#2079270)
Change-Id: Iaf15ead1df560633f9d1b7e915ac846bb6789bf2
2009-10-05 11:01:30 -07:00
satok
e90b74aa04 Avoid NPE at onRefresh in MessageList
BUG: 2161449
2009-10-05 15:53:57 +09:00
Marc Blank
d6951a6578 am c9e05f16: Merge change I13229d84 into eclair
Merge commit 'c9e05f16b278967f929d18798d3f9d254096b01d' into eclair-mr2

* commit 'c9e05f16b278967f929d18798d3f9d254096b01d':
  Change logging command to help debug Moto issue (#2165649)
2009-10-04 21:16:37 -07:00
Android (Google) Code Review
c9e05f16b2 Merge change I13229d84 into eclair
* changes:
  Change logging command to help debug Moto issue (#2165649)
2009-10-05 00:09:01 -04:00
Marc Blank
b3e449edf9 Change logging command to help debug Moto issue (#2165649)
* It has been reported that messages for a particular user are not
  staying in sync re: deletions via PC
* This hasn't been reported elsewhere
* The new logging command logs the subject of deleted messages which
  will help track down the problem
* I have also requested, and expect to receive, an account on the
  Moto server in question to try to replicate the issue

Requesting Dr. No approval for this important change to user logging
code.

Change-Id: I13229d843ef828b54f3514bdded5a7561a87989a
2009-10-04 19:56:19 -07:00
Mihai Preda
84ae53c850 am ba7decd8: Merge change I1197ac76 into eclair
Merge commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190' into eclair-mr2

* commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190':
  MessageCompose: allow sending email when started through external intent.
2009-10-04 15:20:29 -07:00
Marc Blank
c0d9120ffb am bb7a6c54: Merge change Icb449407 into eclair
Merge commit 'bb7a6c5463f7f9fea372079e3afd44cec79b12e5' into eclair-mr2

* commit 'bb7a6c5463f7f9fea372079e3afd44cec79b12e5':
  Fix push failure edge case (#2161999)
2009-10-04 15:18:37 -07:00
Eric Fischer
343fe5d8f8 am 2787f001: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '2787f001fb4b0341cc9949bffde62075b7c68b39' into eclair-mr2

* commit '2787f001fb4b0341cc9949bffde62075b7c68b39':
  Import revised translations.  DO NOT MERGE
2009-10-04 15:15:20 -07:00
Android (Google) Code Review
ba7decd89d Merge change I1197ac76 into eclair
* changes:
  MessageCompose: allow sending email when started through external intent.
2009-10-02 19:26:53 -04:00
Android (Google) Code Review
bb7a6c5463 Merge change Icb449407 into eclair
* changes:
  Fix push failure edge case (#2161999)
2009-10-02 14:36:12 -04:00
Marc Blank
36842abe9f Fix push failure edge case (#2161999)
* Unsafe (potentially stale) data was being written to the Mailbox table near
  the end of each sync.  It would effectively undo changes made to the
  Mailbox in other threads that occurred while the Mailbox was syncing.
* In this particular case, changes to sync interval (push/ping/timed)
  were being overwritten, which could cause push to get lost for as
  long as 30 minutes (the pingLoop timeout when there aren't any
  pingable mailboxes)
* Watchdog alarm was being set to wrong time (typo)
* Add extra user logging in case there are additional cases of push
* Only set sync status and time on successful sync
* Move ping error check into pingParser to avoid unnecessary sync

Change-Id: Icb4494078480ada39b7494b3abf380fb08858406
2009-10-02 11:09:08 -07:00
Mihai Preda
1197ac7692 MessageCompose: allow sending email when started through external intent.
Bug: 2161199.
2009-10-02 15:53:28 +02:00
Eric Fischer
2787f001fb Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-01 16:58:49 -07:00
Marc Blank
1eb0af5d80 Fix NPE issue w/ Contacts sync (#2160417)
* Oversight in late-night submission; simple fix

Change-Id: I0c3ebd4b23c1e913d74e153b3692b3ce8e3c0220
2009-10-01 14:31:24 -07:00
Mihai Preda
ab4fe15476 am 2d34c669: MessageView: scroll webview to (0,0) on message change.
Merge commit '2d34c669c10ec5aec70ec53fe7582feba8166394' into eclair-plus-aosp

* commit '2d34c669c10ec5aec70ec53fe7582feba8166394':
  MessageView: scroll webview to (0,0) on message change.
2009-10-01 06:47:24 -07:00