Commit Graph

735 Commits

Author SHA1 Message Date
Marc Blank
1944cdc42f am 00adf097: Merge change 23197 into eclair
Merge commit '00adf0971bee0ea0e228fc7a468fb54191c2c7b5'

* commit '00adf0971bee0ea0e228fc7a468fb54191c2c7b5':
  Fix some Contacts upsync bugs; add logging for serialization
2009-08-28 18:26:19 -07:00
Android (Google) Code Review
00adf0971b Merge change 23197 into eclair
* changes:
  Fix some Contacts upsync bugs; add logging for serialization
2009-08-28 18:22:39 -07:00
Marc Blank
58267fe146 Fix some Contacts upsync bugs; add logging for serialization
Change-Id: I855a8ee3df520f53fc94866b8463d314cf800ca5
2009-08-28 16:37:29 -07:00
Daniel Sandler
b469b5ca3c am 0740d8ef: Merge change 23140 into eclair
Merge commit '0740d8ef801bf54ccd2c71aa1d923605814c36d4'

* commit '0740d8ef801bf54ccd2c71aa1d923605814c36d4':
  High-resolution (hdpi) artwork from TAT for Email.
2009-08-28 13:20:40 -07:00
Android (Google) Code Review
0740d8ef80 Merge change 23140 into eclair
* changes:
  High-resolution (hdpi) artwork from TAT for Email.
2009-08-28 13:16:13 -07:00
Eric Fischer
20793516d0 am 5c3fedec: Merge change 23027 into eclair
Merge commit '5c3fedecbe68520afda1fbccf8bfcaf6036263b7'

* commit '5c3fedecbe68520afda1fbccf8bfcaf6036263b7':
  Armor string format tokens with translation placeholders.
2009-08-28 13:04:47 -07:00
Android (Google) Code Review
5c3fedecbe Merge change 23027 into eclair
* changes:
  Armor string format tokens with translation placeholders.
2009-08-28 13:00:52 -07:00
Daniel Sandler
bdd319ac29 High-resolution (hdpi) artwork from TAT for Email. 2009-08-28 15:02:44 -04:00
Marc Blank
6d94001a82 am bd4fe2db: Merge change 23114 into eclair
Merge commit 'bd4fe2db84afc7425cff536953faa4f912997736'

* commit 'bd4fe2db84afc7425cff536953faa4f912997736':
  Fix upload of read state for Exchange emails
2009-08-28 10:43:34 -07:00
Marc Blank
118963a567 am c29ec545: Fix Contacts sync adapter required by change to SyncManager
Merge commit 'c29ec54532e17565783353014102d269087c727a'

* commit 'c29ec54532e17565783353014102d269087c727a':
  Fix Contacts sync adapter required by change to SyncManager
2009-08-28 10:43:32 -07:00
Android (Google) Code Review
bd4fe2db84 Merge change 23114 into eclair
* changes:
  Fix upload of read state for Exchange emails
2009-08-28 10:28:21 -07:00
Marc Blank
c29ec54532 Fix Contacts sync adapter required by change to SyncManager
Change-Id: Icfc1f191289170185548a03ca94d1f79f10b7519
2009-08-28 10:25:20 -07:00
Marc Blank
85a78c7495 Fix upload of read state for Exchange emails
Change-Id: Id5959f9c2394644e88b3961dea24f54ff1ad7141
2009-08-28 10:24:27 -07:00
Fred Quintana
dbe681a73f am e3a25fe5: Merge change 23009 into eclair
Merge commit 'e3a25fe58d2e6faa5a622a969e4bb8b62859ce84'

* commit 'e3a25fe58d2e6faa5a622a969e4bb8b62859ce84':
  fix a bug that can allow multiple syncs to start in parallel
2009-08-27 20:06:50 -07:00
Android (Google) Code Review
e3a25fe58d Merge change 23009 into eclair
* changes:
  fix a bug that can allow multiple syncs to start in parallel
2009-08-27 20:02:54 -07:00
Fred Quintana
63ec89f61a fix a bug that can allow multiple syncs to start in parallel 2009-08-27 18:33:49 -07:00
Eric Fischer
a7ba5fe1f2 Armor string format tokens with translation placeholders.
Change-Id: I6b78d906291f6df932b933b384c210c017b720c3
2009-08-27 17:24:38 -07:00
Mihai Preda
35dee62c07 am 52129ec4: Merge change 23001 into eclair
Merge commit '52129ec4b2b4d02012f6d87ed146916995b096d2'

* commit '52129ec4b2b4d02012f6d87ed146916995b096d2':
  MessageCompose: BUG 2069196, compose email from the correct account.
2009-08-27 16:55:03 -07:00
Android (Google) Code Review
52129ec4b2 Merge change 23001 into eclair
* changes:
  MessageCompose: BUG 2069196, compose email from the correct account.
2009-08-27 16:50:14 -07:00
Mihai Preda
948e5ae63b MessageCompose: BUG 2069196, compose email from the correct account. 2009-08-28 01:29:33 +02:00
Marc Blank
6792434c39 am ab11649e: Merge change 22989 into eclair
Merge commit 'ab11649eed5cb73ce06d9fe266456e221b82796d'

* commit 'ab11649eed5cb73ce06d9fe266456e221b82796d':
  Fix usage of isDefault and IS_DEFAULT to be consistent
2009-08-27 16:27:48 -07:00
Marc Blank
d5c3d5a699 am 5525e2b3: Merge change 22996 into eclair
Merge commit '5525e2b3c169656bdd127e7a0aff7242404cbfd6'

* commit '5525e2b3c169656bdd127e7a0aff7242404cbfd6':
  Fix NPE in bug #2080357
2009-08-27 16:27:46 -07:00
Android (Google) Code Review
ab11649eed Merge change 22989 into eclair
* changes:
  Fix usage of isDefault and IS_DEFAULT to be consistent
2009-08-27 16:24:02 -07:00
Android (Google) Code Review
5525e2b3c1 Merge change 22996 into eclair
* changes:
  Fix NPE in bug #2080357
2009-08-27 16:23:52 -07:00
Marc Blank
242fde1920 Fix NPE in bug #2080357
Change-Id: I07c0b65e16568e9cf182b70302f2a1ce90d2581b
2009-08-27 15:58:44 -07:00
Marc Blank
0401ad5334 Fix usage of isDefault and IS_DEFAULT to be consistent
* There was inconsistent usage between int and boolean for this column

Change-Id: Ifa7bd6f2563920a95b6b714f3a7b14e5be29d176
2009-08-27 15:26:06 -07:00
Mihai Preda
d20791dec0 am 0967b74a: am 629e18ad: Fix base64 decoder. BUG 2081740.
Merge commit '0967b74a62720167226e903225d47f25bacc7f92'

* commit '0967b74a62720167226e903225d47f25bacc7f92':
  Fix base64 decoder. BUG 2081740.
2009-08-27 15:20:35 -07:00
Mihai Preda
0967b74a62 am 629e18ad: Fix base64 decoder. BUG 2081740.
Merge commit '629e18ad866917523599ed059898f4d986e49e26' into eclair

* commit '629e18ad866917523599ed059898f4d986e49e26':
  Fix base64 decoder. BUG 2081740.
2009-08-27 15:16:39 -07:00
Marc Blank
a7c02325e6 am f8a81b94: Set ContactsProvider Settings so that ungrouped Exchange contacts display by default
Merge commit 'f8a81b94a3de67e8dcd6a83b06079c2656f511a8'

* commit 'f8a81b94a3de67e8dcd6a83b06079c2656f511a8':
  Set ContactsProvider Settings so that ungrouped Exchange contacts display by default
2009-08-27 14:07:14 -07:00
Mihai Preda
629e18ad86 Fix base64 decoder. BUG 2081740.
It was broken by CL 22378.
The bug was in the situation when "==" (two padding chars) were at
the end, the reading did not stop after the first '=',
and thus one more char of output was generated.
Add more unit-test for base64 decoding.
2009-08-27 22:24:30 +02:00
Marc Blank
f8a81b94a3 Set ContactsProvider Settings so that ungrouped Exchange contacts display by default
Change-Id: Ie7ede23efdd371816c8dc190b8269abd83c5f238
2009-08-27 11:00:59 -07:00
Marc Blank
f11de19eca am 4118beeb: Merge change 22654 into eclair
Merge commit '4118beebed3899bfc3a06928b07500a24b70e5ef'

* commit '4118beebed3899bfc3a06928b07500a24b70e5ef':
  Move some Contacts fields to new CommonDataKinds rows
2009-08-27 09:22:00 -07:00
Marc Blank
418e4f88fa am 6c47a981: Merge change 22873 into eclair
Merge commit '6c47a981845d443f912a33b7a66dff5bf780cf98'

* commit '6c47a981845d443f912a33b7a66dff5bf780cf98':
  Clean up onCreate/onDestroy methods for SyncManager
2009-08-27 09:19:40 -07:00
Android (Google) Code Review
4118beebed Merge change 22654 into eclair
* changes:
  Move some Contacts fields to new CommonDataKinds rows
2009-08-27 09:17:52 -07:00
Android (Google) Code Review
6c47a98184 Merge change 22873 into eclair
* changes:
  Clean up onCreate/onDestroy methods for SyncManager
2009-08-27 09:15:57 -07:00
Andrew Stadler
48971f190a am 2ded414e: Merge change 22840 into eclair
Merge commit '2ded414e99ec6e275865df6cc5d62b4b9c3e01be'

* commit '2ded414e99ec6e275865df6cc5d62b4b9c3e01be':
  Sync "read" and "favorite" back to server.
2009-08-26 23:18:10 -07:00
Android (Google) Code Review
2ded414e99 Merge change 22840 into eclair
* changes:
  Sync "read" and "favorite" back to server.
2009-08-26 23:14:28 -07:00
Andrew Stadler
423206653f Sync "read" and "favorite" back to server.
* Add \FLAGGED support to IMAP (writeback)
* Add code in Controller to kick MessagingController
* Rewrite pending commands system to scan through provider's updated
    messages table and react
* Fix a unit test that I broke
* Cleaned out some of the old PendingCommand support

Addresses the 2nd half (upsync) of bug 1904385

TODO:
Can I add a unit test for IMAP flag writer?

Change-Id: I5a96a695d4f35fca1395506f165b86d9fb19b543
2009-08-26 23:12:02 -07:00
Marc Blank
317a92f51f Clean up onCreate/onDestroy methods for SyncManager
* Put most of onDestroy code into the run method of SyncManager's thread
* Clean up code for updating Mailboxes' SyncKey and interval
* Fixes 2080472

Change-Id: Ie16c851a686142d9fd1d810a942aa786690b1034
2009-08-26 22:09:53 -07:00
Marc Blank
068b541299 am 6c99ea3d: Merge change 22829 into eclair
Merge commit '6c99ea3d02ba1b6b351a4ff4a39eadf90e494349'

* commit '6c99ea3d02ba1b6b351a4ff4a39eadf90e494349':
  Fix #2081145 (Empty subject line imitates magic eight ball)
2009-08-26 16:41:39 -07:00
Android (Google) Code Review
6c99ea3d02 Merge change 22829 into eclair
* changes:
  Fix #2081145 (Empty subject line imitates magic eight ball)
2009-08-26 16:37:56 -07:00
Marc Blank
b01bce9b50 Fix #2081145 (Empty subject line imitates magic eight ball) 2009-08-26 16:37:05 -07:00
Marc Blank
2b1fb26f87 am 7ac828bc: Merge change 22823 into eclair
Merge commit '7ac828bce884c26d7f28486ec49d7f99b81842d3'

* commit '7ac828bce884c26d7f28486ec49d7f99b81842d3':
  Fix bug #2080302
2009-08-26 15:54:29 -07:00
Android (Google) Code Review
7ac828bce8 Merge change 22823 into eclair
* changes:
  Fix bug #2080302
2009-08-26 15:50:26 -07:00
Marc Blank
1851882c8c Fix bug #2080302
* Was trying to retrieve an integer as a boolean in the ContentValues
* The actual Exception (ClassCastException) was buried by ActivityThread
2009-08-26 15:38:30 -07:00
Marc Blank
5cad4ca9d3 am 58299b0b: Merge change 22793 into eclair
Merge commit '58299b0b668a8913f946f48844b8a7cbcbb69963'

* commit '58299b0b668a8913f946f48844b8a7cbcbb69963':
  Handle errors in account creation by AccountManager
2009-08-26 14:35:04 -07:00
Android (Google) Code Review
58299b0b66 Merge change 22793 into eclair
* changes:
  Handle errors in account creation by AccountManager
2009-08-26 14:31:54 -07:00
Mihai Preda
fe1e2356ea am eac52c93: Merge change 22798 into eclair
Merge commit 'eac52c9398327de297e3369409e5f2225d39a08c'

* commit 'eac52c9398327de297e3369409e5f2225d39a08c':
  MessageCompose: bug 2080075 &  2077496.
2009-08-26 14:01:42 -07:00
Android (Google) Code Review
eac52c9398 Merge change 22798 into eclair
* changes:
  MessageCompose: bug 2080075 &  2077496.
2009-08-26 13:57:45 -07:00
Marc Blank
a3c6c6ed29 Handle errors in account creation by AccountManager
* Don't create our EmailProvider Account until we get a confirmation from
  AccountManager that the system Account is created
* Put up an erorr dialog if AccountManager fails for some reason (this is
  what we saw in bug #2072668)
2009-08-26 13:20:23 -07:00