Commit Graph

7972 Commits

Author SHA1 Message Date
Yu Ping Hu
f4ae499a73 am 4b0e2589: Fix checkbox option fetch for combined view.
* commit '4b0e25898e1663f67ecdc38d1e8d9a24bb2d4e89':
  Fix checkbox option fetch for combined view.
2013-04-15 10:57:39 -07:00
Alice Yang
9688e0de8d am 54cf4b9d: Merge "Checkbox vs. sender image setting" into jb-ub-mail-ur9
* commit '54cf4b9d8c04e7531e8474ea01c34419b420fbc4':
  Checkbox vs. sender image setting
2013-04-15 10:57:36 -07:00
Yu Ping Hu
4035515c7d am 7dd26fea: Merge "Improve mailbox sync and load more." into jb-ub-mail-ur9
* commit '7dd26feaea3b6c30339ec10720ebc481fe843cc0':
  Improve mailbox sync and load more.
2013-04-15 10:57:34 -07:00
Paul Westbrook
c3d9414882 am 69ef2b22: Fix TempDirectory initialization
* commit '69ef2b22ff6c5dcce78423ef502d14f841b04fed':
  Fix TempDirectory initialization
2013-04-15 10:57:26 -07:00
Baligh Uddin
992e92ae1e am bb3a938d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
* commit 'bb3a938d613824851e4060ef61ed00cb44a183f8':
  Import translations. DO NOT MERGE
2013-04-15 10:57:15 -07:00
Paul Westbrook
b6247f0a7a am 0c06a7cf: Fixed mis-located cleanup code
* commit '0c06a7cf995c0d3e5dcccae97349891a46c3320f':
  Fixed mis-located cleanup code
2013-04-15 10:57:11 -07:00
Yu Ping Hu
4b0e25898e Fix checkbox option fetch for combined view.
Change-Id: Ie0679ce00ee0558cccc8e10c9346dd730ce08a33
2013-04-11 15:42:09 -07:00
Alice Yang
54cf4b9d8c Merge "Checkbox vs. sender image setting" into jb-ub-mail-ur9 2013-04-11 21:41:51 +00:00
Yu Ping Hu
7dd26feaea Merge "Improve mailbox sync and load more." into jb-ub-mail-ur9 2013-04-11 21:18:47 +00:00
Alice Yang
9f1cff0659 Checkbox vs. sender image setting
Replace the current "Hide checkbox" setting with a tri-state setting with
choice of:
- Show checkboxes
- Show sender image
- Show neither

Bug: 8512959

Change-Id: Ifa233b6d65f8c37388edeed71dbfbfdf1295d6fc
2013-04-11 14:16:01 -07:00
Yu Ping Hu
17d5bbf768 Improve mailbox sync and load more.
- Update syncTime for IMAP and POP whenever we sync.
- Change load more to simply include the delta in the RPC
  rather than using the visibleLimit column.
- Add a query to get the message count for a Mailbox.
- Refactor code for updating totalCount and determining
  the new message count when syncing.
- Remove dead code from Mailbox.
- Remove uses of visibleLimit from code.

Note that visibleLimit and messageCount in Mailbox table are
no longer useful and will be removed in a later change.

Bug: 8579767
Bug: 8523146
Change-Id: Ieb67e3b6f1c82c3b21b972c5a1e557cd75dc21db
2013-04-11 21:06:08 +00:00
Paul Westbrook
69ef2b22ff Fix TempDirectory initialization
The proxy for local services were not intializing the TempDirectory.

Also, move the TempDirectory initialization out of the try/catch block.
Otherwise if Device.getDeviceId threw an exception, the temp directory
wouldn't be initialized

Bug: 8531456
Change-Id: Iea34e0b03203d6c6fe6e5d1ae9902d081bd90c27
2013-04-11 00:39:56 -07:00
Baligh Uddin
bb3a938d61 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9 2013-04-10 20:01:45 +00:00
Baligh Uddin
1a217f1643 Import translations. DO NOT MERGE
Change-Id: I026066648e2e31a9446019beecdbd7ab79559727
Auto-generated-cl: translation import
2013-04-10 12:21:40 -07:00
Baligh Uddin
e80a9bbd51 Import translations. DO NOT MERGE
Change-Id: I124ac625d4f4fb6ade4fea33fecedc768a2ec5a4
Auto-generated-cl: translation import
2013-04-10 12:20:09 -07:00
Paul Westbrook
0c06a7cf99 Fixed mis-located cleanup code
Bug: 8565783
Change-Id: Iab06411cc85cd4958db574ec52eeebb7457c980f
2013-04-10 00:34:04 -07:00
Yu Ping Hu
2e66ac2883 am 8abc602c: Merge "Increment Email version number." into jb-ub-mail-ur9
* commit '8abc602c11cc176b21e330ab639587b2af45cfc9':
  Increment Email version number.
2013-04-09 15:53:22 -07:00
Yu Ping Hu
8abc602c11 Merge "Increment Email version number." into jb-ub-mail-ur9 2013-04-09 22:50:11 +00:00
Vikram Aggarwal
03de7696fc am 6b88a247: Allow queries in folder URIs
* commit '6b88a2471f91e9d4b7fbfff6b8ade7820f64d46d':
  Allow queries in folder URIs
2013-04-09 15:46:43 -07:00
Yu Ping Hu
217163cce7 Increment Email version number.
Change-Id: I521d39f217fa3662038f350587b34021e599b479
2013-04-09 15:24:40 -07:00
Vikram Aggarwal
6b88a2471f Allow queries in folder URIs
As a result of a previous change, we are appending application version
to the end of the folder name.  This breaks the EmailProvider's
expectation about folder URIs.  So instead of using just
uifolder/<number>, allow for uifolder/<number>?<appversion query>

getPathSegments().get(i) will still return the path segment without
the query, so the folder ID gets resolved correctly.

The previous change:
https://googleplex-android-review.googlesource.com/#/c/281416/

Bug: 8435074 Not able to access Exchange inbox and combined inbox

Change-Id: I7b9ffad9b5510d1a08a29e2a21aacb091d4330a6
2013-04-09 15:08:11 -07:00
Paul Westbrook
412758f525 am 7b423bf1: Remove waitForDebugger call
* commit '7b423bf136da2dbc081a2823a6d2c677f66a2b9a':
  Remove waitForDebugger call
2013-04-06 12:41:52 -07:00
Paul Westbrook
7b423bf136 Remove waitForDebugger call
Bug: 8558839
Change-Id: Ie9f351b119620016e9a46c5bf389fdeb75c77382
2013-04-06 12:35:39 -07:00
Yu Ping Hu
d3eb8bcbc1 am 80f268e9: Merge "Increment version number." into jb-ub-mail-ur9
* commit '80f268e91981bf600c897acc6426b09815702f31':
  Increment version number.
2013-04-05 16:47:51 -07:00
Yu Ping Hu
80f268e919 Merge "Increment version number." into jb-ub-mail-ur9 2013-04-05 23:43:11 +00:00
Yu Ping Hu
872f4a63ef am 29304760: Reorder the folders in combined view.
* commit '293047605189eac463b03710ff2a7c1055a6a6dd':
  Reorder the folders in combined view.
2013-04-05 16:41:18 -07:00
Yu Ping Hu
f332e9d938 Increment version number.
Change-Id: I97a37ca97d4260db1458acdc22522e89b38e0b51
2013-04-05 16:40:42 -07:00
Yu Ping Hu
2930476051 Reorder the folders in combined view.
Inbox should go to top.

Change-Id: I90c55952aaa3955adfd6d08a12a568bfb192c730
2013-04-05 16:35:51 -07:00
Paul Westbrook
dfed09fb58 am fcddd014: Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes" into jb-ub-mail-ur9
* commit 'fcddd014dafd33b2db74e51041e3fd0aef617fd6':
  email: "Exchange Services has stopped" - Rain of Exchange Javacrashes
2013-04-05 15:37:24 -07:00
Paul Westbrook
fcddd014da Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes" into jb-ub-mail-ur9 2013-04-05 22:35:37 +00:00
Yu Ping Hu
e0c8d13e81 am 1389f0ed: Merge "Add virtual mailbox for all unread messages." into jb-ub-mail-ur9
* commit '1389f0ed03696a4be4891ce1247867a5dec6b08c':
  Add virtual mailbox for all unread messages.
2013-04-05 15:29:05 -07:00
Yu Ping Hu
1389f0ed03 Merge "Add virtual mailbox for all unread messages." into jb-ub-mail-ur9 2013-04-05 22:25:56 +00:00
Emmanuel Berthier
689efab2b1 email: "Exchange Services has stopped" - Rain of Exchange Javacrashes
Cleanup some nasty records containing NULL fields.

Change-Id: Iec5e7e1bebc4beee8fa010c3f9c9ee723fd2cd83
Author: Emmanuel Berthier <emmanuel.berthier@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 60461

cherry-pick of https://android-review.googlesource.com/#/c/47571/1
2013-04-05 15:22:14 -07:00
Yu Ping Hu
c065e72819 Add virtual mailbox for all unread messages.
Also restores the trash icon. I'm not using the "correct"
icon -- it's the menu icon, not a folder icon -- but it
looks correct. Also, the "unread messages" icon is likewise
the menu icon for mark unread.

Bug: 8527132
Bug: 8444885
Change-Id: I7d3bc286f80f130e6f08ff1340a013d81700406e
2013-04-05 14:50:50 -07:00
Paul Westbrook
c871f110d3 am d402c890: Fixed make POP and Imap more locale safe
* commit 'd402c890dc00e2a0b2cf215d8479e59fc3a252f3':
  Fixed make POP and Imap more locale safe
2013-04-05 14:37:25 -07:00
Paul Westbrook
d402c890dc Fixed make POP and Imap more locale safe
Cherry-picks from:
https://android-review.googlesource.com/#/c/42334/
https://android-review.googlesource.com/#/c/42332/

Change-Id: I557c3d8c725cf6dc4f13f227dcec63864ab5db67
2013-04-05 13:57:51 -07:00
Paul Westbrook
2cd5bb8dd7 am 9fd03edb: Merge "avoid cursor leak in email provider" into jb-ub-mail-ur9
* commit '9fd03edb83326c23fc4dd3944c140de913a4fe76':
  avoid cursor leak in email provider
2013-04-05 13:50:26 -07:00
Jack Bates
c245696c38 am 4fd97a30: Fix SMTP RFC violation for better interoperability
* commit '4fd97a305065dfed11adf50612e55b9647ceb236':
  Fix SMTP RFC violation for better interoperability
2013-04-05 13:50:26 -07:00
Paul Westbrook
9fd03edb83 Merge "avoid cursor leak in email provider" into jb-ub-mail-ur9 2013-04-05 20:49:09 +00:00
Yoohyun.choi
89c74e89e5 avoid cursor leak in email provider
When cursor is done, the cursor must be closed to avoid cursor leak.

cherry-pick of https://android-review.googlesource.com/#/c/52910/
Change-Id: Iaaffed2c4e90dc4b17ae55fcedb242bf890b3dd5
2013-04-05 13:45:56 -07:00
Jack Bates
4fd97a3050 Fix SMTP RFC violation for better interoperability
Space after colon violates RFC 5321 (and RFC 821): "Since it has been a common
source of errors, it is worth noting that spaces are not permitted on either
side of the colon following FROM in the MAIL command or TO in the RCPT command"

Change-Id: Ie5330bf2bd01cd8f734134dadd742cf16df70d7a
Signed-off-by: Jack Bates <jack@nottheoilrig.com>

cherry-pick of https://android-review.googlesource.com/#/c/32640/
2013-04-05 13:42:13 -07:00
Paul Westbrook
e9931d6dba am 156163cc: Prevent NPE
* commit '156163cceb5f56bb53e88e68d4e79bd5c076797f':
  Prevent NPE
2013-04-05 13:33:05 -07:00
Paul Westbrook
156163cceb Prevent NPE
cherry-pick of https://android-review.googlesource.com/#/c/45703/

Change-Id: I8d6984d90365d6bc3e9f102285a06ac9c32a98d4
2013-04-05 12:00:29 -07:00
Paul Westbrook
8272b48f69 am 391a7fc0: Support legacy shortcuts
* commit '391a7fc0e99457308b6f6bd9444c8aba94b0b7b1':
  Support legacy shortcuts
2013-04-04 13:42:51 -07:00
Paul Westbrook
391a7fc0e9 Support legacy shortcuts
We need to support shortcuts that were created with previous versions
of Email

Bug: 8530220
Change-Id: I9e2a44b561f5617ffa954af37a9e78a95400f7dc
2013-04-04 02:45:17 -07:00
Mark Wei
102df0ea66 am 30dec61d: Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9
* commit '30dec61dbd57ebfbdab7755d50d18471aab59178':
  Attachments in Conversation List: UI changes to display attachment previews in the conversation list.
2013-04-03 17:51:16 -07:00
Mark Wei
30dec61dbd Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9 2013-04-04 00:47:57 +00:00
Baligh Uddin
e02991c6ee am cca79c7d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
* commit 'cca79c7d7293227fe4912dc083108351f8fa9542':
  Import translations. DO NOT MERGE
2013-04-03 15:14:06 -07:00
Baligh Uddin
cca79c7d72 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9 2013-04-03 22:09:50 +00:00
Baligh Uddin
9e0992d6ad Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-04-03 22:09:28 +00:00