ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,998 Commits 2 Branches 0 Tags 45 MiB
0e4f9a834a
Commit Graph

1998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Blank
5660af68e9 am d457c744: Merge change Ic1a2e5b9 into eclair 
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-mr2

* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
  Fix improper constant to allow retry for sending Exchange mail
 2009-11-20 13:36:31 -08:00
Marc Blank
5e353e3f77 am d457c744: Merge change Ic1a2e5b9 into eclair 
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-plus-aosp

* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
  Fix improper constant to allow retry for sending Exchange mail
 2009-11-20 13:36:30 -08:00
Android (Google) Code Review
d457c744cd Merge change Ic1a2e5b9 into eclair 
* changes:
  Fix improper constant to allow retry for sending Exchange mail
 2009-11-20 13:32:59 -08:00
Marc Blank
eec04663fe Fix improper constant to allow retry for sending Exchange mail 
* Related to MR1 triaged bug 2274389 in which mail was stuck in the
  Outbox and wouldn't send
* It turns out an improper constant was being used in the SQL code
  for turning off the "error" state flag

Change-Id: Ic1a2e5b9dd34ec3f9d7da0b3d2cd63d77bb7681e
 2009-11-20 12:10:23 -08:00
Marc Blank
6ba40085d7 am 863e6c40: Handle "send outgoing messages" properly for combined Outbox 
Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-mr2

* commit '863e6c40202fe804d92a263809da74ec1e904e66':
  Handle "send outgoing messages" properly for combined Outbox
 2009-11-20 09:56:03 -08:00
Marc Blank
52b06a1de6 am 863e6c40: Handle "send outgoing messages" properly for combined Outbox 
Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-plus-aosp

* commit '863e6c40202fe804d92a263809da74ec1e904e66':
  Handle "send outgoing messages" properly for combined Outbox
 2009-11-20 09:54:44 -08:00
Marc Blank
863e6c4020 Handle "send outgoing messages" properly for combined Outbox 
* The "send outgoing messages" button doesn't work in the combined
  inbox (the case wasn't handled)
* Add code to loop through accounts, calling the Controller for each
  in this case
* Fixes (partially or completely) #2274389

Change-Id: I94e984247d43f93a4d6546b8c10f6ce149b091be
 2009-11-20 09:46:35 -08:00
satok
cd99251d01 am 740f6c71: am 6128baf6: Merge change I6002ed3b into eclair-mr2 
Merge commit '740f6c718af0a863dd83def810a2472b77db9987'

* commit '740f6c718af0a863dd83def810a2472b77db9987':
  Improve visible difference between read and unread messages
 2009-11-20 00:15:12 -08:00
satok
740f6c718a am 6128baf6: Merge change I6002ed3b into eclair-mr2 
Merge commit '6128baf612da16e6c5d6776abcd6799849a49c11' into eclair-mr2-plus-aosp

* commit '6128baf612da16e6c5d6776abcd6799849a49c11':
  Improve visible difference between read and unread messages
 2009-11-20 00:11:21 -08:00
Android (Google) Code Review
6128baf612 Merge change I6002ed3b into eclair-mr2 
* changes:
  Improve visible difference between read and unread messages
 2009-11-20 00:08:32 -08:00
satok
47da97527b Improve visible difference between read and unread messages 
BUG: 2168155
 2009-11-20 17:06:40 +09:00
Marc Blank
a141124249 am 0e030b69: am bdb28c16: Fix #2267475 (NPE when changing incoming settings for EAS) 
Merge commit '0e030b69511fe81d446085928eda71b22ce52d0f'

* commit '0e030b69511fe81d446085928eda71b22ce52d0f':
  Fix #2267475 (NPE when changing incoming settings for EAS)
 2009-11-19 09:06:53 -08:00
Marc Blank
5587a3ae2b am db4d1aa5: am 6b93f61e: Merge change Ib35bb866 into eclair-mr2 
Merge commit 'db4d1aa55575256e28a66d606a9a5e1d4c8a7fa1'

* commit 'db4d1aa55575256e28a66d606a9a5e1d4c8a7fa1':
  Don't allow "trash" to be synced (Fixes #2116463)
 2009-11-19 09:05:17 -08:00
Marc Blank
0e030b6951 am bdb28c16: Fix #2267475 (NPE when changing incoming settings for EAS) 
Merge commit 'bdb28c164494178fa5d62858c17876a8568470df' into eclair-mr2-plus-aosp

* commit 'bdb28c164494178fa5d62858c17876a8568470df':
  Fix #2267475 (NPE when changing incoming settings for EAS)
 2009-11-19 09:05:07 -08:00
Marc Blank
db4d1aa555 am 6b93f61e: Merge change Ib35bb866 into eclair-mr2 
Merge commit '6b93f61eea40f83e2bb35aa45fb0301b48225260' into eclair-mr2-plus-aosp

* commit '6b93f61eea40f83e2bb35aa45fb0301b48225260':
  Don't allow "trash" to be synced (Fixes #2116463)
 2009-11-19 09:01:18 -08:00
Marc Blank
bdb28c1644 Fix #2267475 (NPE when changing incoming settings for EAS) 
* When settings are changed, we loop through the sync error map,
  clearing mailboxes in the changed account that are in an error
  state.
* It's possible that there are mailboxes referenced in the map that
  no longer exist.  When trying to retrieve them from the provider,
  null is returned, but we're not checking for this case, and an
  NPE results.
* The fix is simply to check for null, and clear the error map for
  the mailboxId that references a deleted mailbox

Change-Id: I8c1c847090026fa1c53b09bbe6b12d864bce4df1
 2009-11-19 09:01:06 -08:00
Android (Google) Code Review
6b93f61eea Merge change Ib35bb866 into eclair-mr2 
* changes:
  Don't allow "trash" to be synced (Fixes #2116463)
 2009-11-19 08:57:39 -08:00
Marc Blank
6daaf76459 Don't allow "trash" to be synced (Fixes #2116463) 
Change-Id: Ib35bb86641b473194fea32b55db328a44de1c67b
 2009-11-18 17:20:44 -08:00
Dan Egnor
494e923977 am 45ea7ec0: am 2da2e463: Change android.text.util.Regex to com.android.common.Patterns 
Merge commit '45ea7ec021f67b5c84dae431552cf0fcd7deb211'

* commit '45ea7ec021f67b5c84dae431552cf0fcd7deb211':
  Change android.text.util.Regex to com.android.common.Patterns
 2009-11-18 13:19:37 -08:00
Dan Egnor
45ea7ec021 am 2da2e463: Change android.text.util.Regex to com.android.common.Patterns 
Merge commit '2da2e4632dfd84f956d778f3fe6a83c2719296c7' into eclair-mr2-plus-aosp

* commit '2da2e4632dfd84f956d778f3fe6a83c2719296c7':
  Change android.text.util.Regex to com.android.common.Patterns
 2009-11-18 13:06:53 -08:00
Dan Egnor
2da2e4632d Change android.text.util.Regex to com.android.common.Patterns 2009-11-18 12:11:55 -08:00
Elliott Hughes
5e062514bf Move the org.kxml2.wap.Wbxml class into the EAS code, the only user. 
(I notice that you already have, for example, an END constant, but with
a different value. Bug?)

Bug: 2249953
 2009-11-17 15:10:40 -08:00
Elliott Hughes
5d987f98f6 am 39166ef9: (-s ours) am b1487a20: DO NOT MERGE: Back-port 2249953 fix (for email unbundling). 
Merge commit '39166ef9cee9cb395d818305506ca6956f8fc750'

* commit '39166ef9cee9cb395d818305506ca6956f8fc750':
  DO NOT MERGE: Back-port 2249953 fix (for email unbundling).
 2009-11-16 14:49:47 -08:00
Elliott Hughes
39166ef9ce am b1487a20: DO NOT MERGE: Back-port 2249953 fix (for email unbundling). 
Merge commit 'b1487a203051c679fe568e9d4c90a40180576ab4' into eclair-mr2-plus-aosp

* commit 'b1487a203051c679fe568e9d4c90a40180576ab4':
  DO NOT MERGE: Back-port 2249953 fix (for email unbundling).
 2009-11-16 14:41:43 -08:00
Elliott Hughes
b1487a2030 DO NOT MERGE: Back-port 2249953 fix (for email unbundling). 
Original check-in comment:
Move the org.kxml2.wap.Wbxml class into the EAS code, the only user.

Dr No approval: danfuzz
 2009-11-16 13:26:18 -08:00
Android (Google) Code Review
094acdfe51 Merge change Id2944c35 
* changes:
  Move the org.kxml2.wap.Wbxml class into the EAS code, the only user.
 2009-11-16 08:18:17 -08:00
Jean-Baptiste Queru
fafd55b998 am 87765285: merge from open-source master 
Merge commit '877652859181fa140a47f1e58dffa23e035fd693'

* commit '877652859181fa140a47f1e58dffa23e035fd693':
  eclair snapshot
 2009-11-15 15:03:35 -08:00
Jean-Baptiste Queru
8776528591 merge from open-source master 2009-11-15 14:55:24 -08:00
Jean-Baptiste Queru
feafc728c3 merge from open-source master 
Merge commit 'goog/stage-korg-master' into HEAD
 2009-11-15 14:06:39 -08:00
Jean-Baptiste Queru
76f193a16f merge from eclair 2009-11-15 12:06:47 -08:00
Elliott Hughes
d2944c357b Move the org.kxml2.wap.Wbxml class into the EAS code, the only user. 
(I notice that you already have, for example, an END constant, but with
a different value. Bug?)

Bug: 2249953
 2009-11-13 18:08:49 -08:00
Eric Fischer
085e8001f4 am 5aa99d54: (-s ours) am e2ea3e4f: am 743b143d: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '5aa99d54cc432ad6efcdaeecdb6844512e6d52a1'

* commit '5aa99d54cc432ad6efcdaeecdb6844512e6d52a1':
  Import revised translations.  DO NOT MERGE
 2009-11-13 17:58:08 -08:00
Eric Fischer
5aa99d54cc am e2ea3e4f: am 743b143d: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit 'e2ea3e4f878a7005aeef77a7f7e2f0f2519cdc15' into eclair-mr2-plus-aosp

* commit 'e2ea3e4f878a7005aeef77a7f7e2f0f2519cdc15':
  Import revised translations.  DO NOT MERGE
 2009-11-13 17:54:20 -08:00
Eric Fischer
e2ea3e4f87 am 743b143d: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-mr2

* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
  Import revised translations.  DO NOT MERGE
 2009-11-13 17:51:00 -08:00
Eric Fischer
4372e0df9c am 743b143d: Import revised translations. DO NOT MERGE 
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-plus-aosp

* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
  Import revised translations.  DO NOT MERGE
 2009-11-13 17:49:51 -08:00
Eric Fischer
743b143d0e Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-11-13 17:21:24 -08:00
Eric Fischer
5fc2e9dbf0 am 5555edfc: (-s ours) am 0a68553a: am bf67508d: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '5555edfca803eeeb912bdae3c9a0bc476237af01'

* commit '5555edfca803eeeb912bdae3c9a0bc476237af01':
  Import revised translations.  DO NOT MERGE
 2009-11-13 11:23:34 -08:00
Eric Fischer
5555edfca8 am 0a68553a: am bf67508d: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '0a68553ae6b7e125587ed7c525afb7fc1d128ccc' into eclair-mr2-plus-aosp

* commit '0a68553ae6b7e125587ed7c525afb7fc1d128ccc':
  Import revised translations.  DO NOT MERGE
 2009-11-13 10:51:39 -08:00
Eric Fischer
0a68553ae6 am bf67508d: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-mr2

* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
  Import revised translations.  DO NOT MERGE
 2009-11-13 10:37:13 -08:00
Eric Fischer
16ff4c4d36 am bf67508d: Import revised translations. DO NOT MERGE 
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-plus-aosp

* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
  Import revised translations.  DO NOT MERGE
 2009-11-13 10:34:07 -08:00
Eric Fischer
bf67508d16 Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-11-12 19:48:23 -08:00
Jean-Baptiste Queru
56e48981f0 eclair snapshot 2009-11-12 18:46:09 -08:00
Marc Blank
ec51897ca3 am b68cc5b3: (-s ours) am 19887795: am 83b67e61: (-s ours) Fix #2251837; better response w/ security req\'d. DO NOT MERGE 
Merge commit 'b68cc5b3093b949b5e714d5d4205a8781272ce08'

* commit 'b68cc5b3093b949b5e714d5d4205a8781272ce08':
  Fix #2251837; better response w/ security req'd. DO NOT MERGE
 2009-11-11 17:33:21 -08:00
Marc Blank
b68cc5b309 am 19887795: am 83b67e61: (-s ours) Fix #2251837; better response w/ security req\'d. DO NOT MERGE 
Merge commit '1988779570489485bf280b5ef45dad5caf0a483b' into eclair-mr2-plus-aosp

* commit '1988779570489485bf280b5ef45dad5caf0a483b':
  Fix #2251837; better response w/ security req'd. DO NOT MERGE
 2009-11-11 17:24:43 -08:00