Commit Graph

1942 Commits

Author SHA1 Message Date
Marc Blank
ff636171da am 7a4b1c72: Merge change I146f63ab into eclair-mr2
Merge commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b' into eclair-mr2-plus-aosp

* commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b':
  Don't delete referenced messages from the Exchange server
2009-12-09 15:42:37 -08:00
Marc Blank
9dc9f44ba3 am 0e1595c1: Handle unexpected deletion of EmailProvider database
Merge commit '0e1595c177e40428b267a8696dfc05d015ce6a2f' into eclair-mr2-plus-aosp

* commit '0e1595c177e40428b267a8696dfc05d015ce6a2f':
  Handle unexpected deletion of EmailProvider database
2009-12-09 15:42:33 -08:00
Marc Blank
936886206b am ecfc9e92: Merge change Icba56688 into eclair-mr2
Merge commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e' into eclair-mr2-plus-aosp

* commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e':
  Ensure that service calls run outside the UI thread (#2235734)
2009-12-09 15:41:42 -08:00
Andrew Stadler
f22c389792 am baf739eb: am fdfdd73c: (-s ours) DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f' into eclair-mr2-plus-aosp

* commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-09 15:41:37 -08:00
Fred Quintana
052eefe406 changed to use the new EntityIterator interface 2009-12-09 10:30:58 -08:00
Android (Google) Code Review
7a4b1c72f6 Merge change I146f63ab into eclair-mr2
* changes:
  Don't delete referenced messages from the Exchange server
2009-12-07 21:31:42 -08:00
Marc Blank
c29e435eb3 Don't delete referenced messages from the Exchange server
* Addresses #2287439 incompletely
* The most likely reason for a reply/forward to get stuck in the Outbox
  is that the referenced message has been deleted from the client, with
  the deletion occuring BEFORE the message gets sent (currently, the two
  are completely independent)
* This change causes deletes NOT to be sent to the server if the message
  to be deleted is referenced by an outgoing message

Change-Id: I146f63ab345c07e684790e1d7d1fc08870468bbf
2009-12-07 21:30:59 -08:00
Marc Blank
0e1595c177 Handle unexpected deletion of EmailProvider database
* Addresses #2226426
* If the user deletes Email data, or if data corruption causes
  EmailProvider.db to be deleted, we will be in an inconsistent
  state with any existing Exchange accounts, since the AccountManager
  will still know about them, contacts (and eventually calendar) items will
  continue to exist, etc.
* Run an integrity check when the provider is created, deleting any
  orphaned EmailProvider.db or EmailProviderBody.db
* Catch SQLiteException's in the Provider and do an integrity check
  if any is caught

Change-Id: I47d523b90a6b8f71ba8e13fba4b04846b3da1b1d
2009-12-07 21:12:57 -08:00
satok
3d00377b35 Fix MessageListUnitTests
This is supperement of change,33265

* Move custom cursor to inner static class
* Change public to /* package */
* Move PROJECTION to a package
2009-12-08 13:36:32 +09:00
Android (Google) Code Review
ecfc9e92e5 Merge change Icba56688 into eclair-mr2
* changes:
  Ensure that service calls run outside the UI thread (#2235734)
2009-12-07 19:00:02 -08:00
Marc Blank
14d0151268 am 34210419: am 3af9f4cb: Merge change I9bec1244 into eclair-mr2
Merge commit '3421041995f39ed1aaa8ffdb1170cd9bc6ca4c61'

* commit '3421041995f39ed1aaa8ffdb1170cd9bc6ca4c61':
  Fix #2300147 (mistakenly reporting connection error)
2009-12-07 18:33:03 -08:00
Andrew Stadler
baf739ebdb am fdfdd73c: (-s ours) DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac' into eclair-mr2

* commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-07 16:13:56 -08:00
Andrew Stadler
8ebf6c51a2 am fdfdd73c: DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac' into eclair-plus-aosp

* commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-07 16:13:14 -08:00
Andrew Stadler
fdfdd73ceb DO NOT MERGE. Improve colors of read/unread messages.
Backport of 47da97527b547da97527b5bbecba972e0c6a5d382cd7b0768e9.
Original comment:
  Improve visible difference between read and unread messages
  BUG: 2168155
2009-12-07 13:58:41 -08:00
Marc Blank
3421041995 am 3af9f4cb: Merge change I9bec1244 into eclair-mr2
Merge commit '3af9f4cbf325ee8be923e98344e9a441c0284ae7' into eclair-mr2-plus-aosp

* commit '3af9f4cbf325ee8be923e98344e9a441c0284ae7':
  Fix #2300147 (mistakenly reporting connection error)
2009-12-07 10:21:57 -08:00
Android (Google) Code Review
3af9f4cbf3 Merge change I9bec1244 into eclair-mr2
* changes:
  Fix #2300147 (mistakenly reporting connection error)
2009-12-07 10:19:23 -08:00
Vasu Nori
541fa47ee3 am afbad523: am b720ed31: revert previously submitted CL 34143.
Merge commit 'afbad5230eedafb4ec4d2fbd6341e86cf0ea9c4e'

* commit 'afbad5230eedafb4ec4d2fbd6341e86cf0ea9c4e':
  revert previously submitted CL 34143.
2009-12-04 09:45:44 -08:00
Vasu Nori
afbad5230e am b720ed31: revert previously submitted CL 34143.
Merge commit 'b720ed318324c69ddbcb15c4a1b9e132f3266775' into eclair-mr2-plus-aosp

* commit 'b720ed318324c69ddbcb15c4a1b9e132f3266775':
  revert previously submitted CL 34143.
2009-12-04 09:43:22 -08:00
Vasu Nori
b720ed3183 revert previously submitted CL 34143.
turns out the change I submitted before is not required at all. I mistakenly
assumed sqlite wouldn't be able to handle it. but tested it with the latest
version of sqlite 3.6.20. the old style triggers work fine.
2009-12-03 18:32:58 -08:00
Marc Blank
d3da948c31 Fix #2300147 (mistakenly reporting connection error)
* When a mailbox sync is stopped intentionally (for example, if account
  settings change), we report a connection error by mistake
* Handle this case properly, reporting "success" (i.e. no error state)
* Remove obsolete comment

Change-Id: I9bec1244267cd2240c369b9b7f905948381a0f91
2009-12-03 09:58:56 -08:00
Jim Miller
547204c1ed resolved conflicts for merge of d1b162af to master 2009-12-03 07:55:09 -08:00
Eric Fischer
678cecd17e am f04b324f: (-s ours) am 3d32f562: am 59057917: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'f04b324fe0efc6a39a609575a882c6cc3f958710'

* commit 'f04b324fe0efc6a39a609575a882c6cc3f958710':
  Import revised translations.  DO NOT MERGE
2009-12-02 20:49:48 -08:00
Vasu Nori
7bcf7c6daf am 8c08ef3d: am 98796942: Merge change I8e09bde5 into eclair-mr2
Merge commit '8c08ef3db7d3ba072702d35cedb5512a5ab7f449'

* commit '8c08ef3db7d3ba072702d35cedb5512a5ab7f449':
  change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
2009-12-02 20:38:44 -08:00
Jim Miller
d1b162af18 am dbd49f02: am 6d69fb7c: Fix 2266119: Simplify account creation strings and remove translation requirement
Merge commit 'dbd49f026f829d7236a4c0ac0f155aea5fabecb5' into eclair-mr2-plus-aosp

* commit 'dbd49f026f829d7236a4c0ac0f155aea5fabecb5':
  Fix 2266119: Simplify account creation strings and remove translation requirement
2009-12-02 19:07:25 -08:00
Eric Fischer
f04b324fe0 am 3d32f562: am 59057917: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '3d32f5621734bc9698ac1d5892d6ee58ffd98c34' into eclair-mr2-plus-aosp

* commit '3d32f5621734bc9698ac1d5892d6ee58ffd98c34':
  Import revised translations.  DO NOT MERGE
2009-12-02 19:07:22 -08:00
Jim Miller
dbd49f026f am 6d69fb7c: Fix 2266119: Simplify account creation strings and remove translation requirement
Merge commit '6d69fb7c577f49558e8431564e3700913a9c1ac5' into eclair-mr2

* commit '6d69fb7c577f49558e8431564e3700913a9c1ac5':
  Fix 2266119: Simplify account creation strings and remove translation requirement
2009-12-02 19:04:52 -08:00
Jim Miller
874629f84a am 6d69fb7c: Fix 2266119: Simplify account creation strings and remove translation requirement
Merge commit '6d69fb7c577f49558e8431564e3700913a9c1ac5' into eclair-plus-aosp

* commit '6d69fb7c577f49558e8431564e3700913a9c1ac5':
  Fix 2266119: Simplify account creation strings and remove translation requirement
2009-12-02 19:04:51 -08:00
Jim Miller
6d69fb7c57 Fix 2266119: Simplify account creation strings and remove translation requirement
This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
2009-12-02 18:58:55 -08:00
Eric Fischer
3d32f56217 am 59057917: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-mr2

* commit '5905791775e7e431135bda21969b9e5efd24de62':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:07:33 -08:00
Eric Fischer
e3ce4c29b3 am 59057917: Import revised translations. DO NOT MERGE
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-plus-aosp

* commit '5905791775e7e431135bda21969b9e5efd24de62':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:06:30 -08:00
Marc Blank
3379c51569 Ensure that service calls run outside the UI thread (#2235734)
Change-Id: Icba566884f3b994c8a4ccc4b8658c40b133a3509
2009-12-02 15:01:06 -08:00
Eric Fischer
5905791775 Import revised translations. DO NOT MERGE 2009-12-02 14:56:24 -08:00
Vasu Nori
8c08ef3db7 am 98796942: Merge change I8e09bde5 into eclair-mr2
Merge commit '98796942eab3215eb1c3c8486a65a152e8cee516' into eclair-mr2-plus-aosp

* commit '98796942eab3215eb1c3c8486a65a152e8cee516':
  change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
2009-12-02 14:47:20 -08:00
Android (Google) Code Review
98796942ea Merge change I8e09bde5 into eclair-mr2
* changes:
  change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
2009-12-02 14:42:46 -08:00
Eric Fischer
80f4496f34 am fe5829fc: (-s ours) am c2b42a4d: am ddc69f42: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'fe5829fcdc3774264e7ae73b5a3b4a9c0df7634a'

* commit 'fe5829fcdc3774264e7ae73b5a3b4a9c0df7634a':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:34:40 -08:00
Eric Fischer
fe5829fcdc am c2b42a4d: am ddc69f42: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c2b42a4d67efdb90f66212d00fb2cbbbc1c879df' into eclair-mr2-plus-aosp

* commit 'c2b42a4d67efdb90f66212d00fb2cbbbc1c879df':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:24:20 -08:00
Eric Fischer
c2b42a4d67 am ddc69f42: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-mr2

* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:06:17 -08:00
satok
0374c79042 am 2bae776e: am 4cb25d93: Save the state of checkboxes when orientation is changed
Merge commit '2bae776e55231a365e1a0c326a736cbbbba166eb'

* commit '2bae776e55231a365e1a0c326a736cbbbba166eb':
  Save the state of checkboxes when orientation is changed
2009-12-01 09:13:49 -08:00
satok
2bae776e55 am 4cb25d93: Save the state of checkboxes when orientation is changed
Merge commit '4cb25d93a23d086b954c03cb72afb2cf0248f1c4' into eclair-mr2-plus-aosp

* commit '4cb25d93a23d086b954c03cb72afb2cf0248f1c4':
  Save the state of checkboxes when orientation is changed
2009-11-30 22:44:37 -08:00
satok
4cb25d93a2 Save the state of checkboxes when orientation is changed
BUG: 2239516

* Add tests for save/restore Instance State
2009-12-01 15:41:10 +09:00
Eric Fischer
e66549c97d am ddc69f42: Import revised translations. DO NOT MERGE
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-plus-aosp

* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
  Import revised translations.  DO NOT MERGE
2009-11-30 11:59:41 -08:00
Eric Fischer
ddc69f4248 Import revised translations. DO NOT MERGE 2009-11-30 11:35:56 -08:00
Vasu Nori
8e09bde568 change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond 2009-11-25 15:38:42 -08:00
Jean-Baptiste Queru
4238fb8929 am b7374252: merge from open-source master
Merge commit 'b73742528492d022472b8a02c17cf0a8ae622e85'

* commit 'b73742528492d022472b8a02c17cf0a8ae622e85':
  Move the org.kxml2.wap.Wbxml class into the EAS code, the only user.
2009-11-24 09:29:04 -08:00
Jean-Baptiste Queru
b737425284 merge from open-source master 2009-11-24 09:22:52 -08:00
Jean-Baptiste Queru
ee0c01548e merge from open-source master 2009-11-24 09:12:36 -08:00
Marc Blank
6552a8a137 am a5c8360e: am 5660af68: am d457c744: Merge change Ic1a2e5b9 into eclair
Merge commit 'a5c8360eac593490bafa235e54b43f264c5d861c'

* commit 'a5c8360eac593490bafa235e54b43f264c5d861c':
  Fix improper constant to allow retry for sending Exchange mail
2009-11-20 13:45:09 -08:00
Marc Blank
4d1f42208c am 7d5839da: am 6ba40085: am 863e6c40: Handle "send outgoing messages" properly for combined Outbox
Merge commit '7d5839da5a26bda21e136ac62378836544b551dc'

* commit '7d5839da5a26bda21e136ac62378836544b551dc':
  Handle "send outgoing messages" properly for combined Outbox
2009-11-20 13:45:05 -08:00
Marc Blank
a5c8360eac am 5660af68: am d457c744: Merge change Ic1a2e5b9 into eclair
Merge commit '5660af68e96e7ec2f17c9c057ef013bdecfa8665' into eclair-mr2-plus-aosp

* commit '5660af68e96e7ec2f17c9c057ef013bdecfa8665':
  Fix improper constant to allow retry for sending Exchange mail
2009-11-20 13:40:35 -08:00
Marc Blank
7d5839da5a am 6ba40085: am 863e6c40: Handle "send outgoing messages" properly for combined Outbox
Merge commit '6ba40085d7519681c140cbcacdecd4636bfc4ce3' into eclair-mr2-plus-aosp

* commit '6ba40085d7519681c140cbcacdecd4636bfc4ce3':
  Handle "send outgoing messages" properly for combined Outbox
2009-11-20 13:40:32 -08:00