Commit Graph

1333 Commits

Author SHA1 Message Date
Marc Blank
97269fa25d am 0911d629: Merge change Id69cee9b into eclair-mr2
Merge commit '0911d6290f7e137d4deeda8104d49743ee84a6ef' into eclair-mr2-plus-aosp

* commit '0911d6290f7e137d4deeda8104d49743ee84a6ef':
  Fix folder deletion; add support for folder rename (#2118439)
2009-10-29 12:12:19 -07:00
Android (Google) Code Review
0911d6290f Merge change Id69cee9b into eclair-mr2
* changes:
  Fix folder deletion; add support for folder rename (#2118439)
2009-10-29 15:06:56 -04:00
Marc Blank
d2cc832782 Fix folder deletion; add support for folder rename (#2118439)
* Folder delete had a subtle error that could cause subsequent folder
  changes in the same sync to fail (using wrong end tag)
* Folder change (rename, move) wasn't implemented; this was added and
  tested.  The change is very straightforward and low risk.

Change-Id: Id69cee9b99e9a988a176a6525ba9a1615b741c44
2009-10-29 12:03:39 -07:00
Mihai Preda
69ee7c0210 am 9abd1bf9: Merge change I21052e28 into eclair-mr2
Merge commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc' into eclair-mr2-plus-aosp

* commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc':
  Controller: modify the test for "attachment already loaded".
2009-10-29 06:39:25 -07:00
Android (Google) Code Review
9abd1bf9da Merge change I21052e28 into eclair-mr2
* changes:
  Controller: modify the test for "attachment already loaded".
2009-10-29 09:34:43 -04:00
Mihai Preda
96c2925587 am 6bb7c724: MessageView: disable reply&forward for Trash messages.
Merge commit '6bb7c7248af1057eaf6f672be03bc46c8d03472d' into eclair-mr2-plus-aosp

* commit '6bb7c7248af1057eaf6f672be03bc46c8d03472d':
  MessageView: disable reply&forward for Trash messages.
2009-10-29 06:20:21 -07:00
Mihai Preda
6bb7c7248a MessageView: disable reply&forward for Trash messages.
Bug 2170118
2009-10-29 14:11:10 +01:00
Mihai Preda
ce81062d3e am 3126629d: Merge change I77ee7815 into eclair-mr2
Merge commit '3126629db5bfb2c2ae089913b96b9e0657694be9' into eclair-mr2-plus-aosp

* commit '3126629db5bfb2c2ae089913b96b9e0657694be9':
  MessageView: center the presence dot with the From text.
2009-10-29 06:05:17 -07:00
Android (Google) Code Review
3126629db5 Merge change I77ee7815 into eclair-mr2
* changes:
  MessageView: center the presence dot with the From text.
2009-10-29 08:57:36 -04:00
Marc Blank
a62525a365 am 8df45282: am 0054c1a9: (-s ours) Merge change If12d0e7c into eclair
Merge commit '8df4528248e6dc72a7a63732c34c4246eddba937' into eclair-mr2-plus-aosp

* commit '8df4528248e6dc72a7a63732c34c4246eddba937':
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-29 01:41:16 -07:00
Marc Blank
cbfb39b8cc am 5ce592f4: am 2533132c: (-s ours) Merge change Ic29d3eac into eclair
Merge commit '5ce592f4b250b2649757192358722a1ce49a3775' into eclair-mr2-plus-aosp

* commit '5ce592f4b250b2649757192358722a1ce49a3775':
  Server validates even though server address is wrong DO NOT MERGE
2009-10-29 01:41:11 -07:00
Marc Blank
eb72328c2b am 38ca29b6: am ea5b93d9: (-s ours) Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
Merge commit '38ca29b6ae69cc12499319550a947ffa19af3352' into eclair-mr2-plus-aosp

* commit '38ca29b6ae69cc12499319550a947ffa19af3352':
  Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
2009-10-29 01:41:06 -07:00
Marc Blank
8df4528248 am 0054c1a9: (-s ours) Merge change If12d0e7c into eclair
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-mr2

* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-29 01:29:21 -07:00
Marc Blank
5ce592f4b2 am 2533132c: (-s ours) Merge change Ic29d3eac into eclair
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-mr2

* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
  Server validates even though server address is wrong DO NOT MERGE
2009-10-29 01:29:15 -07:00
Marc Blank
38ca29b6ae am ea5b93d9: (-s ours) Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
Merge commit 'ea5b93d9b825e17eddf7f34cd37abef98e9949bd' into eclair-mr2

* commit 'ea5b93d9b825e17eddf7f34cd37abef98e9949bd':
  Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
2009-10-29 01:29:08 -07:00
Android (Google) Code Review
0054c1a9e6 Merge change If12d0e7c into eclair
* changes:
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-28 13:56:10 -04:00
Android (Google) Code Review
2533132c84 Merge change Ic29d3eac into eclair
* changes:
  Server validates even though server address is wrong DO NOT MERGE
2009-10-28 13:55:43 -04:00
Mihai Preda
77ee78152b MessageView: center the presence dot with the From text.
Bug: 2216938
2009-10-28 17:54:52 +01:00
Marc Blank
5d4bb79044 Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
* The problem is that PendingIntents aren't updated when a notification
  is updated, so the changed extras when a 2nd account gets a new message
  aren't seen by MessageList when it's started up upon tapping the
  notification (it uses the extras from the 1st account to get a new
  message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
  causes the extras in the PendingIntent to be updated

Change-Id: If12d0e7c6d3f256befeca98b560443395820737f
2009-10-28 08:57:45 -07:00
Marc Blank
e53de6985a Server validates even though server address is wrong DO NOT MERGE
* Fixes #2173664
* Make sure that not only is the OPTIONS command accepted, but that
  the server reports EAS versions and commands

Change-Id: Ic29d3eacfdc54d107600afc443964a1e8b3d5e59
2009-10-28 08:53:57 -07:00
Marc Blank
ea5b93d9b8 Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
* An Exchange log from Moto has shown sync behavior in which moreAvailable
  is set to true even though there are no changes in the sync response
  (i.e. the SyncKey is unchanged)
* This leads to long-lived looping which impacts battery life
* The fix is to recognize the behavior and prevent looping by
  setting moreAvailable = false

Change-Id: Icf45efbc24331c874c820b7b177e39b16df445d8
2009-10-22 14:49:26 -07:00
Mihai Preda
9ef6f645f5 Controller: modify the test for "attachment already loaded".
Bug 2192510.

update unit test.
2009-10-22 19:27:59 +02:00
Eric Fischer
b3d778dfcd am 9ccda56c: am ba2d6de4: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '9ccda56cb30e665cc84810c10f5dbb3b4b78ceff' into eclair-mr2-plus-aosp

* commit '9ccda56cb30e665cc84810c10f5dbb3b4b78ceff':
  Import revised translations.  DO NOT MERGE
2009-10-22 09:33:40 -07:00
Eric Fischer
9ccda56cb3 am ba2d6de4: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831' into eclair-mr2

* commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831':
  Import revised translations.  DO NOT MERGE
2009-10-22 06:46:18 -07:00
Marc Blank
155228d43c am da08e3bc: Merge change I218079f2 into eclair-mr2
Merge commit 'da08e3bcb6dc83409f136b5e80e1ce1ab2925936' into eclair-mr2-plus-aosp

* commit 'da08e3bcb6dc83409f136b5e80e1ce1ab2925936':
  Fix timing-dependent crash in Medium tests (#2202726)
2009-10-21 15:49:57 -07:00
Marc Blank
a06961dbac am d16b4b92: Go to combined inbox from notification for 2+ accounts (#2147265)
Merge commit 'd16b4b921fef0a79a12fd90a5fad353413ba80ea' into eclair-mr2-plus-aosp

* commit 'd16b4b921fef0a79a12fd90a5fad353413ba80ea':
  Go to combined inbox from notification for 2+ accounts (#2147265)
2009-10-21 15:49:54 -07:00
Android (Google) Code Review
da08e3bcb6 Merge change I218079f2 into eclair-mr2
* changes:
  Fix timing-dependent crash in Medium tests (#2202726)
2009-10-21 18:44:47 -04:00
Marc Blank
d16b4b921f Go to combined inbox from notification for 2+ accounts (#2147265)
* The problem is that PendingIntents aren't updated when a notification
  is updated, so the changed extras when a 2nd account gets a new message
  aren't seen by MessageList when it's started up upon tapping the
  notification (it uses the extras from the 1st account to get a new
  message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
  causes the extras in the PendingIntent to be updated

Change-Id: Ia4ab14954b2c1413526016975216b2516372f2aa
2009-10-21 13:51:16 -07:00
Marc Blank
38203a3fde Fix timing-dependent crash in Medium tests (#2202726)
Change-Id: I218079f24f1ce08d770624d1272e1d9a46c1be26
2009-10-21 12:41:57 -07:00
Eric Fischer
ba2d6de4b7 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-21 10:44:46 -07:00
satok
2c79dfdeaa am 3045bb96: Add view of all counts in AccountFolderList
Merge commit '3045bb967fa7bd88dc52c332cbeb7ffcd4252fe4' into eclair-mr2-plus-aosp

* commit '3045bb967fa7bd88dc52c332cbeb7ffcd4252fe4':
  Add view of all counts in AccountFolderList
2009-10-20 15:42:43 -07:00
satok
3045bb967f Add view of all counts in AccountFolderList
BUG: 2201097
2009-10-21 07:19:10 +09:00
Marc Blank
549fc327f1 am 528fa1bb: Merge change Icabbe5fe into eclair-mr2
Merge commit '528fa1bbca31c0c436dc6dc941286d9757f8675f' into eclair-mr2-plus-aosp

* commit '528fa1bbca31c0c436dc6dc941286d9757f8675f':
  Fix #2159410 (side-effect of unexpected account deletion)
2009-10-20 12:07:32 -07:00
Android (Google) Code Review
528fa1bbca Merge change Icabbe5fe into eclair-mr2
* changes:
  Fix #2159410 (side-effect of unexpected account deletion)
2009-10-20 15:01:54 -04:00
Marc Blank
f265a1d217 am 36796363: Fix SQL for upgrade from ver 6 to ver 7 of Email database
Merge commit '367963639d4291511b7e175a208e2b553aac26c2' into eclair-mr2-plus-aosp

* commit '367963639d4291511b7e175a208e2b553aac26c2':
  Fix SQL for upgrade from ver 6 to ver 7 of Email database
2009-10-20 11:07:13 -07:00
Marc Blank
c1b8efad50 Fix #2159410 (side-effect of unexpected account deletion)
Change-Id: Icabbe5fe5c417ff72b542eff7a54c658814d482b
2009-10-20 10:51:08 -07:00
Marc Blank
367963639d Fix SQL for upgrade from ver 6 to ver 7 of Email database
Fixes #2196917

Change-Id: Ia403e50e9ec4ea553d38ded656bba769a4a4dd18
2009-10-20 10:11:26 -07:00
satok
4ee9d9033c am 4bc81bb2: Fix build breakage
Merge commit '4bc81bb2863101aad460a24c04abd08370adfa6e' into eclair-mr2-plus-aosp

* commit '4bc81bb2863101aad460a24c04abd08370adfa6e':
  Fix build breakage
2009-10-19 12:26:17 -07:00
satok
4bc81bb286 Fix build breakage 2009-10-20 04:19:21 +09:00
satok
80705854ff am ba78d18f: Merge change I23b7f225 into eclair-mr2
Merge commit 'ba78d18f59c73273739260e52d87b2ef8b81ab44' into eclair-mr2-plus-aosp

* commit 'ba78d18f59c73273739260e52d87b2ef8b81ab44':
  Clean up appearance of unread counters
2009-10-19 11:27:57 -07:00
Android (Google) Code Review
ba78d18f59 Merge change I23b7f225 into eclair-mr2
* changes:
  Clean up appearance of unread counters
2009-10-19 14:20:01 -04:00
satok
fa368b50d6 Clean up appearance of unread counters
BUG: 2161746
2009-10-20 03:18:27 +09:00
Marc Blank
f78c84a72a am 3a88e2c3: am 55a97fc3: Fix attachment loading with "accept certificates" checked
Merge commit '3a88e2c35c274b249b095067ae87f89eaf15906e' into eclair-mr2-plus-aosp

* commit '3a88e2c35c274b249b095067ae87f89eaf15906e':
  Fix attachment loading with "accept certificates" checked
2009-10-19 10:46:26 -07:00
Marc Blank
3a88e2c35c am 55a97fc3: Fix attachment loading with "accept certificates" checked
Merge commit '55a97fc360ac549631af3aa3aad9833812674562' into eclair-mr2

* commit '55a97fc360ac549631af3aa3aad9833812674562':
  Fix attachment loading with "accept certificates" checked
2009-10-19 10:40:15 -07:00
Marc Blank
55a97fc360 Fix attachment loading with "accept certificates" checked
* Fixes #2191778 (P1/S1)
* Attachment retrieval wasn't using newer code to create its
  HttpClient.
* Fix is simple, extremely safe

Change-Id: I65be27decae8719bbad8ac7dce1c1164de4371a5
2009-10-19 10:34:10 -07:00
Marc Blank
dfeff3d8a7 am dc9bc35b: Merge change Idef455f3 into eclair-mr2
Merge commit 'dc9bc35bb1adf4ef5deb4125eb0df0fef0c45dfc' into eclair-mr2-plus-aosp

* commit 'dc9bc35bb1adf4ef5deb4125eb0df0fef0c45dfc':
  Handle case of moreAvailable true with no changes (#2189704)
2009-10-15 13:36:14 -07:00
Android (Google) Code Review
dc9bc35bb1 Merge change Idef455f3 into eclair-mr2
* changes:
  Handle case of moreAvailable true with no changes (#2189704)
2009-10-15 16:28:19 -04:00
Marc Blank
288bb26ab8 Handle case of moreAvailable true with no changes (#2189704)
* An Exchange log from Moto has shown sync behavior in which moreAvailable
  is set to true even though there are no changes in the sync response
  (i.e. the SyncKey is unchanged)
* This leads to long-lived looping which impacts battery life
* The fix is to recognize the behavior and prevent looping by
  setting moreAvailable = false

Change-Id: Idef455f3e1170caf4002542ca432d128b3a19e56
2009-10-15 12:11:39 -07:00
Marc Blank
bdaf801ea2 am f095e9df: Merge change Ib53e4411 into eclair-mr2
Merge commit 'f095e9df5a8dbd97dcefecb479fbcce05ddb4d87' into eclair-mr2-plus-aosp

* commit 'f095e9df5a8dbd97dcefecb479fbcce05ddb4d87':
  Clear out orphaned messages in updates/deletes tables
2009-10-15 12:09:46 -07:00
Android (Google) Code Review
f095e9df5a Merge change Ib53e4411 into eclair-mr2
* changes:
  Clear out orphaned messages in updates/deletes tables
2009-10-15 15:03:41 -04:00