Commit Graph

9642 Commits

Author SHA1 Message Date
Yu Ping Hu
4b73385ecb Merge "Prevent a NPE in ImapService search handling" into jb-ub-mail-ur10 2013-10-24 22:56:29 +00:00
Martin Hibdon
7dad461e9e Prevent a NPE in ImapService search handling
b/11339972

Change-Id: Ief34e6e1fd59d029847dc8525a34f20ea9de26b1
2013-10-23 16:44:31 -07:00
Tony Mantler
a250e81410 am 340a29e5: Merge "Restore sender snippet for nested folder teaser." into jb-ub-mail-ur10
* commit '340a29e5fac431fceae6a54fd5b85b87861396ef':
  Restore sender snippet for nested folder teaser.
2013-10-23 15:45:25 -07:00
Tony Mantler
340a29e5fa Merge "Restore sender snippet for nested folder teaser." into jb-ub-mail-ur10 2013-10-23 22:42:39 +00:00
Tony Mantler
7a18b83a4f am e3cf91af: Set parentServerId for IMAP folders to prevent fixup code from resetting parentKey
* commit 'e3cf91af61fed0b35ef8cbb5790c39a143af7470':
  Set parentServerId for IMAP folders to prevent fixup code from resetting parentKey
2013-10-23 15:42:16 -07:00
Martin Hibdon
c86fbb5bcb Add an additional mailbox key column to message table
b/11294681
The problem is that when we try to open an attachment for a
message in search results, it fails. The reason is that part of
loading the attachment, we need to open the remote folder the
message is in. For search results, the message's mailboxKey is
the special fake "search_results" folder, which doesn't actually
exist on the server.
For this change, I've added a new column called "mainMailboxKey".
For search results, this column will be populated with the real
mailbox the message is in. It will be blank for other messages.

This is a quick and low risk fix for this bug, but it's kind
of awkward. We would prefer to do one or both of the following
some time after MR1.

1. Make the "search_results" folder be a virtual folder, the same
way that unread, starred, and other virtual folders are. For these,
there is actually no mailbox row in the database, just some
queries that check various flags in the messages and behave
like folders in the UI. The messages actually still reside in the
real folders.
2. Remove the requirement to open the folder at all to load the
attachment.

Change-Id: I825ab846f78bf8b041a5d1d579260dc5d7b4c522
2013-10-23 14:58:57 -07:00
Tony Mantler
4cece307c4 Restore sender snippet for nested folder teaser.
It's a bit ugly, but it's much better than firing up a new loader for each subfolder.

b/11288044

Change-Id: Ia568f82ccd615ee950944d411c30f9470a55aea9
2013-10-23 14:30:59 -07:00
Tony Mantler
e3cf91af61 Set parentServerId for IMAP folders to prevent fixup code from resetting parentKey
b/11355523

Change-Id: Idbef28cdbbc0eac50552fabeb24e2ec49a6cd042
2013-10-23 14:14:21 -07:00
Tony Mantler
0da6f45fbf am bf39d116: Merge "Coalesce notification updates to avoid spamming the notification tray" into jb-ub-mail-ur10
* commit 'bf39d1166ca775dcfd4977c0d5bb5fbd1a3c8bee':
  Coalesce notification updates to avoid spamming the notification tray
2013-10-22 14:59:43 -07:00
Tony Mantler
bf39d1166c Merge "Coalesce notification updates to avoid spamming the notification tray" into jb-ub-mail-ur10 2013-10-22 21:57:41 +00:00
Justin Ho
fbcdac9bb8 am 3cc5e68b: Merge "Change trigger to allow duplicate messages in search folders" into jb-ub-mail-ur10
* commit '3cc5e68bd2fdb42ae186498c28ed4220ef755caf':
  Change trigger to allow duplicate messages in search folders
2013-10-22 12:36:03 -07:00
Yu Ping Hu
fe83e2939b am b8ef7da6: Merge "Treat updates into non-existent body rows as inserts." into jb-ub-mail-ur10
* commit 'b8ef7da6340b3ce3638e43335a359bd2ca4e521f':
  Treat updates into non-existent body rows as inserts.
2013-10-22 12:36:03 -07:00
Andrew Sapperstein
fa56e0f2e3 Merge "Add datetimepicker to Android.mk." into jb-ub-mail-ur11 2013-10-22 17:14:29 +00:00
Justin Ho
3cc5e68bd2 Merge "Change trigger to allow duplicate messages in search folders" into jb-ub-mail-ur10 2013-10-22 03:34:23 +00:00
Martin Hibdon
ac40b86485 Change trigger to allow duplicate messages in search folders
b/11294681
b/11325976
The problem is that when we get a message as part of a search
result, we'll end up deleting that message from the inbox (or
whatever folder it's currently in). This is because there is
a trigger that deletes messages if a new message is inserted
that has the same serverId and account.

Now, messages with duplicate serverId/account combinations are
allowed if one of the messages is in a SEARCH type folder.
Also, make a change so that when a message comes down in
a search result, we do also copy it into the primary mailbox
that message resides in, we only add it to the SEARCH folder.
Prior to this there was some code that intended to put
the search result message into the regular mailbox it's supposed
to be in, so that we'd have correct state in that message.
Unfortunately, there are several problems with this:
1. The code didn't work, it would make a copy in the regular
folder, and then unconditionally move it to the search folder.
2. If we leave this code in place, putting the message
temporarily into the regular folder still activates the duplicate
message deletion trigger, wiping out the original copy, even with
the update to the trigger.
3. It's unclear that it's even desirable to load the search
result message into the regular folder. It could be a very old
message that would not have been synced before, leaving a large
gap in your inbox, which is confusing and could interfere with
IMAP syncing.

Change-Id: I34671a3b677ab42a3efd0d170a6ebd9246ec493d
2013-10-22 02:26:15 +00:00
Andrew Sapperstein
c2abe3070d Add datetimepicker to Android.mk.
Change-Id: I0f6c3cc96155a9444144182ca48142401ffaacb7
2013-10-21 18:41:30 -07:00
Yu Ping Hu
b8ef7da634 Merge "Treat updates into non-existent body rows as inserts." into jb-ub-mail-ur10 2013-10-21 23:46:14 +00:00
Yu Ping Hu
d0b81a0d06 Treat updates into non-existent body rows as inserts.
Bug: 11245727
Change-Id: I648b0267e9149f3f431ce01be9789087f73edab1
2013-10-21 16:35:45 -07:00
Yu Ping Hu
58202dd5dd am 1fb5fa69: Merge "Populate real name in From: field" into jb-ub-mail-ur10
* commit '1fb5fa6981c66d2eca19187e738eb1f77fb464ec':
  Populate real name in From: field
2013-10-21 15:48:39 -07:00
Yu Ping Hu
1fb5fa6981 Merge "Populate real name in From: field" into jb-ub-mail-ur10 2013-10-21 22:46:55 +00:00
Yu Ping Hu
d9ea4b7787 am 7b28bb95: Merge "Update the folder sync status while searching in IMAP" into jb-ub-mail-ur10
* commit '7b28bb95a34556c5a84e128ba206bff64288d741':
  Update the folder sync status while searching in IMAP
2013-10-21 11:48:43 -07:00
Yu Ping Hu
7b28bb95a3 Merge "Update the folder sync status while searching in IMAP" into jb-ub-mail-ur10 2013-10-21 18:47:09 +00:00
Yu Ping Hu
833de6c0fb am a5a28ffb: Do not require RPC for getCapabilities.
* commit 'a5a28ffb63785eefe8602174316d9ba6233ac428':
  Do not require RPC for getCapabilities.
2013-10-18 19:17:49 -07:00
Tony Mantler
632ee24d48 Populate real name in From: field
b/11246653

Change-Id: I8629ba655b99629f7b14f857acb67cb8453ddb8b
2013-10-18 16:49:56 -07:00
Yu Ping Hu
a5a28ffb63 Do not require RPC for getCapabilities.
Bug: 11241892
Change-Id: I3da136c9035414c821ee2038da01134c551bb9dd
2013-10-18 14:09:09 -07:00
Alon Albert
3601790240 am 7c8d4802: Merge "Handle User Refresh in Edge Cases" into jb-ub-mail-ur10
* commit '7c8d480276123eca0d57179a4874f0046aa57d66':
  Handle User Refresh in Edge Cases
2013-10-18 11:18:07 -07:00
Alon Albert
7c8d480276 Merge "Handle User Refresh in Edge Cases" into jb-ub-mail-ur10 2013-10-18 18:15:38 +00:00
Tony Mantler
a2b82c1a92 Coalesce notification updates to avoid spamming the notification tray
b/11115818

Change-Id: I1d8bfbb87c279c9967eee7295f31ddd7728b200c
2013-10-18 10:24:44 -07:00
Alon Albert
8c989772df Handle User Refresh in Edge Cases
Handle the following edge cases when a manual refresh is triggered:
* No connectivity
* Low storage space
* Timeout (sync not started)

Bug: 11241113
Change-Id: I580235d633fcb65999c0bfe8bf383c9c8ba72110
2013-10-18 09:32:47 -07:00
Tony Mantler
af52f20930 Update the folder sync status while searching in IMAP
b/7538620

Change-Id: I7bb0c706fd63b1fe7d20dc0f186934e0dcac2f06
2013-10-17 16:07:21 -07:00
Tony Mantler
571a4de8c4 am e2391fec: Fix resource overlay order for AOSP Email
* commit 'e2391fec5140f103773a642ed51c12ce94a20da0':
  Fix resource overlay order for AOSP Email
2013-10-17 14:33:15 -07:00
Tony Mantler
e2391fec51 Fix resource overlay order for AOSP Email
b/11255375

Change-Id: I2aa677024500b9944e9bce7846ba7488c28748a8
2013-10-17 12:07:22 -07:00
Tony Mantler
b5e2ec1b65 am 16467713: Merge "Don\'t bail out of downloading an attachment if the size is delcared as zero" into jb-ub-mail-ur10
* commit '164677131a481828590b03b3b4c7a8cdf6fadcee':
  Don't bail out of downloading an attachment if the size is delcared as zero
2013-10-17 11:09:03 -07:00
Tony Mantler
164677131a Merge "Don't bail out of downloading an attachment if the size is delcared as zero" into jb-ub-mail-ur10 2013-10-17 18:07:46 +00:00
Isaac Katzenelson
cff5933367 am 5cdffe37: Merge "Bump app version to test the play store DL" into jb-ub-mail-ur10
* commit '5cdffe3724dd739ab10f13cbb632ecade806921c':
  Bump app version to test the play store DL
2013-10-17 10:56:47 -07:00
Isaac Katzenelson
5cdffe3724 Merge "Bump app version to test the play store DL" into jb-ub-mail-ur10 2013-10-17 17:53:58 +00:00
Yu Ping Hu
5ac203cd8a am c084e818: Merge "Don\'t allow duplicate messages to appear in Sent folder" into jb-ub-mail-ur10
* commit 'c084e8188d87e57c109d246f81fccbc584900d54':
  Don't allow duplicate messages to appear in Sent folder
2013-10-17 10:42:38 -07:00
Yu Ping Hu
c084e8188d Merge "Don't allow duplicate messages to appear in Sent folder" into jb-ub-mail-ur10 2013-10-17 17:41:32 +00:00
Isaac Katzenelson
19a79dd319 Bump app version to test the play store DL
Bug: 11237949
Change-Id: I8ee575b22357bfaed616d8adee92991900f7e076
2013-10-17 10:35:01 -07:00
Tony Mantler
4aaf3f2e33 Don't bail out of downloading an attachment if the size is delcared as zero
b/11225306

Change-Id: If67401dd3e6b652b03fba2e71cfc82fdae80ccb2
2013-10-17 09:46:03 -07:00
Baligh Uddin
a5a367a1de am 42067b70: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '42067b707bd965dc0e06c48fef8c8e5948ab075f':
  Import translations. DO NOT MERGE
2013-10-17 08:27:53 -07:00
Baligh Uddin
f96626ae5c Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-10-17 15:25:54 +00:00
Baligh Uddin
42067b707b Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-10-17 15:25:50 +00:00
Baligh Uddin
3d860534f8 Import translations. DO NOT MERGE
Change-Id: I0aca68da2e47d8b4eb72d6434f725439a251f96e
Auto-generated-cl: translation import
2013-10-17 02:01:20 -07:00
Baligh Uddin
2832edc06d Import translations. DO NOT MERGE
Change-Id: I7748428abd734eb9496d62e1aba9ea2a7c687c14
Auto-generated-cl: translation import
2013-10-17 01:59:17 -07:00
Martin Hibdon
37b539063d Don't allow duplicate messages to appear in Sent folder
b/11224731
There is a problem in ImapService.processPendingUploads().
It was trying to process updates to existing messages
as uploads. This is wrong, it means that marking a sent
messages as Read can cause it to be uploaded again,
resuling in a new message being created.

Change-Id: I502df52a7b315daeee10c1041db8f30dbfd2c04e
2013-10-16 22:46:25 -07:00
Tony Mantler
4c04087abd am 7acf30e9: Make sure account upgrade code always runs before reconciling
* commit '7acf30e9ab077362dc03812583044fb3e23206c3':
  Make sure account upgrade code always runs before reconciling
2013-10-16 18:06:44 -07:00
Tony Mantler
7acf30e9ab Make sure account upgrade code always runs before reconciling
b/11240251

Change-Id: Id6d6ad98b729757991b19c8dcd84822d6216f9a0
2013-10-16 17:14:54 -07:00
Martin Hibdon
28dd863c18 am 85d21905: Clear all "drafts" related flags from email when sending
* commit '85d2190552d05dbc06518bdc21674c6aabeb583b':
  Clear all "drafts" related flags from email when sending
2013-10-14 18:01:46 -07:00
Martin Hibdon
85d2190552 Clear all "drafts" related flags from email when sending
b/11224331

Change-Id: I1df8ea3e0e24b050cd391dea454124e06988bf7d
2013-10-14 17:42:02 -07:00