Baligh Uddin
3532658bff
Merge "Import translations. DO NOT MERGE" into ub-mail-ur12
2013-11-07 04:05:25 +00:00
Yu Ping Hu
dc9fe643a8
am 47395c37
: am 1580fcac
: Merge "Hack to make the Conversation View footer reload when a POP message finishes loading" into jb-ub-mail-ur10
...
* commit '47395c3729bff231477a76b3dfa330959b27db3e':
Hack to make the Conversation View footer reload when a POP message finishes loading
2013-11-06 18:08:05 -08:00
Yu Ping Hu
326c29ce0f
am 63c5adbc
: am 8846a12c
: Merge "Correct some logging in ADS" into jb-ub-mail-ur10
...
* commit '63c5adbc1eb4c9d811bcdc17dede6c895115afcc':
Correct some logging in ADS
2013-11-06 18:08:04 -08:00
Martin Hibdon
2181795d13
am ce99df0b
: am 80e9fa84
: Merge "Update the duplicate message deletion trigger" into jb-ub-mail-ur10
...
* commit 'ce99df0b3cd8fea167947b19f7aba72771c8d07c':
Update the duplicate message deletion trigger
2013-11-06 18:08:04 -08:00
Yu Ping Hu
47395c3729
am 1580fcac
: Merge "Hack to make the Conversation View footer reload when a POP message finishes loading" into jb-ub-mail-ur10
...
* commit '1580fcacc0125e3c6f013821d6890436b97e96c1':
Hack to make the Conversation View footer reload when a POP message finishes loading
2013-11-06 18:05:32 -08:00
Yu Ping Hu
63c5adbc1e
am 8846a12c
: Merge "Correct some logging in ADS" into jb-ub-mail-ur10
...
* commit '8846a12c9480799e6a6ade983f7bbcbcb38cca81':
Correct some logging in ADS
2013-11-06 18:05:31 -08:00
Martin Hibdon
ce99df0b3c
am 80e9fa84
: Merge "Update the duplicate message deletion trigger" into jb-ub-mail-ur10
...
* commit '80e9fa84b8061805485452f9d2d38c3c010cc993':
Update the duplicate message deletion trigger
2013-11-06 18:05:31 -08:00
Yu Ping Hu
1580fcacc0
Merge "Hack to make the Conversation View footer reload when a POP message finishes loading" into jb-ub-mail-ur10
2013-11-07 02:03:08 +00:00
Yu Ping Hu
8846a12c94
Merge "Correct some logging in ADS" into jb-ub-mail-ur10
2013-11-07 00:38:58 +00:00
Martin Hibdon
80e9fa84b8
Merge "Update the duplicate message deletion trigger" into jb-ub-mail-ur10
2013-11-07 00:38:56 +00:00
Martin Hibdon
1ad443612d
Correct some logging in ADS
...
b/11436795
Some of the logging I enabled here actually causes an
exception to be thrown because the format didn't match
the args in the log command.
Change-Id: If86942e64927c0e8df7573ef099824899e20c289
2013-11-06 15:47:16 -08:00
Baligh Uddin
50685ecafe
Import translations. DO NOT MERGE
...
Change-Id: I5a1bc6f69f1adadb1c75031c400b5551c087fef7
Auto-generated-cl: translation import
2013-11-06 15:37:47 -08:00
Martin Hibdon
13ff5b86ac
Update the duplicate message deletion trigger
...
b/11535121
Now we only delete messages with the same serverId and account
if the account is an exchange account.
Change-Id: Ic2ebb465ccdb38724b88daac8ac40771c7a24bed
2013-11-06 14:55:42 -08:00
Martin Hibdon
f7266536b3
am 5e78ddd2
: am 580b3f7b
: Merge "Fix attachments in search results" into jb-ub-mail-ur10
...
* commit '5e78ddd2a0c64f39e77f2cb3d901f22788af5114':
Fix attachments in search results
2013-11-06 12:26:15 -08:00
Martin Hibdon
5e78ddd2a0
am 580b3f7b
: Merge "Fix attachments in search results" into jb-ub-mail-ur10
...
* commit '580b3f7b380cb72ed66bb92a68e2b194344ce97b':
Fix attachments in search results
2013-11-06 12:24:39 -08:00
Martin Hibdon
580b3f7b38
Merge "Fix attachments in search results" into jb-ub-mail-ur10
2013-11-06 20:22:07 +00:00
Alon Albert
a277dcd8d3
am 1e7df7ec
: am 042e6940
: Merge "Build with current SDK" into jb-ub-mail-ur10
...
* commit '1e7df7ec985f76cd0b39b76d6260626134686a13':
Build with current SDK
2013-11-06 11:16:54 -08:00
Alon Albert
1e7df7ec98
am 042e6940
: Merge "Build with current SDK" into jb-ub-mail-ur10
...
* commit '042e69400f1dc256b970f867dc1afd9f0918bbe9':
Build with current SDK
2013-11-06 11:14:07 -08:00
Alon Albert
042e69400f
Merge "Build with current SDK" into jb-ub-mail-ur10
2013-11-06 19:12:00 +00:00
Martin Hibdon
d482cbd54b
Fix attachments in search results
...
b/11294681
We had some really broken logic about handling search
results.
In IMAP search, we would request, in a single pass,
FLAGS, ENVELOPE, STRUCTURE, and BODY_SANE. BODY_SANE means
the first N bytes of message content, whether it be from
the message text or attachments. This is different from how
sync works: In sync, we get FLAGS and ENVELOPE in one pass,
and in a later pass get STRUCTURE and first body part text
for each message.
If the total size of the message exceeded the maximum limit
for BODY_SANE, then we'd mark the message as partial, which
would cause us to create a dummy attachment in copyMessageToProvider().
This is a weird solution to the problem of POP messages not
being completely loaded, because in POP message body and
attachments can't be requested separately, so the dummy attachment
just signified that we needed to fetch more data.
This system fails completely on IMAP, because just fetching the
rest of the body will not get you the attachments.
But even if that code is disabled, attachments in search results
still didn't work properly. For reasons I don't yet understand,
if we requet both STRUCTURE and BODY_SANE at the same time, either
we don't received the full attachment metadata, or we ignore it, and
only use the attachments whose contents could actually fit in the
limit imposed by BODY_SANE. So attachments that didn't fit,
or didn't completely fit, would either be missing or corrupt
and unretriveable.
So, end result: It's not clear why we were trying to load
BODY_SANE all in one pass, unlike how it works for sync.
In fact, the way sync does it now makes a lot of sense: We
load FLAGS and ENVELOPE data (small) and put the in the DB
immediately so they can be displayed. In the second pass we
load the (potentially large) structure and message body. If this
is the right solution for sync, it's probably the right solution
for search. So now, that's what we do.
There is cleanup I'd like to do post MR1: Some code is duplicated
between sync and search that could be consolidated, but we're in
low risk mode now so I only changed search code.
Change-Id: I11475e290cda04b91f76d38ba952679e8e8964d5
2013-11-06 10:53:07 -08:00
Alon Albert
4927a24f6f
Build with current SDK
...
Bug: 11533662
Change-Id: I13c26034c1cb2dcc03c281b49dda4df184592e17
2013-11-05 17:54:30 -08:00
Tony Mantler
88c357b041
am ec1fb965
: am 06e140e4
: Update messaging when autodiscover fails due to an auth error
...
* commit 'ec1fb96505d1a7f239b01110bc451a298ad57867':
Update messaging when autodiscover fails due to an auth error
2013-11-05 17:22:37 -08:00
Tony Mantler
ec1fb96505
am 06e140e4
: Update messaging when autodiscover fails due to an auth error
...
* commit '06e140e4a42c11e60331229963d27548ea35551c':
Update messaging when autodiscover fails due to an auth error
2013-11-05 17:20:37 -08:00
Tony Mantler
06e140e4a4
Update messaging when autodiscover fails due to an auth error
...
b/11538085
Change-Id: I76689cbd89eef233588804edeb3893f1ad36bebe
2013-11-05 16:14:56 -08:00
Tony Mantler
62604b1a44
Hack to make the Conversation View footer reload when a POP message finishes loading
...
Get rid of this later when we stop using dummy attachments for "Load More"
b/11439833
Change-Id: Ia0ea9408fb74b6c305de43eada306c5df4c5fd59
2013-11-05 11:22:12 -08:00
Tony Mantler
bd6d0edfb4
am 222303cc
: am dbda4a00
: Add permission required for eml viewer to save attachments
...
* commit '222303ccc1a9cca82562979db5ffa2e208a0e359':
Add permission required for eml viewer to save attachments
2013-11-04 15:20:21 -08:00
Tony Mantler
222303ccc1
am dbda4a00
: Add permission required for eml viewer to save attachments
...
* commit 'dbda4a005bb050279883860163b6691e01c57bf1':
Add permission required for eml viewer to save attachments
2013-11-04 15:18:15 -08:00
Tony Mantler
dbda4a005b
Add permission required for eml viewer to save attachments
...
b/11437237
Change-Id: I55b9d70c9b5e02d58151b4e678aa09348f921b63
2013-11-04 11:53:33 -08:00
Tony Mantler
1f15c022bd
am 429b0335
: am e1064b92
: Merge "Foreign characters may be letters and digits, but they\'re not allowed in Uri/Url schemes" into jb-ub-mail-ur10
...
* commit '429b0335833d4788bdc53a7c7505a278b0297b7d':
Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes
2013-11-01 17:29:30 -07:00
Yu Ping Hu
de1b8ec426
am 0fb9b9ef
: am 294a4248
: Merge "Fix off by one error." into jb-ub-mail-ur10
...
* commit '0fb9b9efe644afaf8f45a0873f2f4c7c183cbfe8':
Fix off by one error.
2013-11-01 17:29:28 -07:00
Tony Mantler
429b033583
am e1064b92
: Merge "Foreign characters may be letters and digits, but they\'re not allowed in Uri/Url schemes" into jb-ub-mail-ur10
...
* commit 'e1064b92228a89623606155cc37f3f8273fc38fe':
Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes
2013-11-01 17:27:05 -07:00
Yu Ping Hu
0fb9b9efe6
am 294a4248
: Merge "Fix off by one error." into jb-ub-mail-ur10
...
* commit '294a4248beae466c7aa19ad5b5683d35ed053f7a':
Fix off by one error.
2013-11-01 17:27:04 -07:00
Tony Mantler
e1064b9222
Merge "Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes" into jb-ub-mail-ur10
2013-11-01 22:20:53 +00:00
Yu Ping Hu
294a4248be
Merge "Fix off by one error." into jb-ub-mail-ur10
2013-11-01 22:19:38 +00:00
Yu Ping Hu
1a6a3fe797
Fix off by one error.
...
Bug: 11475318
Change-Id: I046fc66713c54f355a3dc4e6b7b7b288a1450326
2013-11-01 10:36:44 -07:00
Baligh Uddin
5c4fbb187d
am 82868225
: (-s ours) am bd68009d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '8286822520f94d301eca2d091ad4dca37a2053d0':
Import translations. DO NOT MERGE
2013-11-01 08:00:51 -07:00
Baligh Uddin
8286822520
am bd68009d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit 'bd68009dfdca76d67667880fca79328c11e30407':
Import translations. DO NOT MERGE
2013-11-01 07:58:00 -07:00
Baligh Uddin
5e2d28a502
am 27a788f7
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
...
* commit '27a788f74098167085ee8a3f34ebd6e613690104':
Import translations. DO NOT MERGE
2013-11-01 07:57:34 -07:00
Baligh Uddin
143dab5908
Merge "Import translations. DO NOT MERGE" into ub-mail-ur12
2013-11-01 14:55:35 +00:00
Baligh Uddin
27a788f740
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-11-01 14:55:22 +00:00
Baligh Uddin
bd68009dfd
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-11-01 14:55:17 +00:00
Martin Hibdon
2d49f0df50
am c085911e
: Merge "Add logging to see why attachments fail to load" into jb-ub-mail-ur10
...
* commit 'c085911eeeb18059be403b1a506d50f2cc807b43':
Add logging to see why attachments fail to load
2013-10-31 18:26:30 -07:00
Martin Hibdon
c085911eee
Merge "Add logging to see why attachments fail to load" into jb-ub-mail-ur10
2013-11-01 01:22:15 +00:00
Tony Mantler
2ed113c713
Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes
...
b/11356390
Change-Id: Ic510607ab5f671e3f3f474ea3c2f4af7e9966cb1
2013-10-31 16:39:03 -07:00
Tony Mantler
a3e839cca9
am 3ddd39b6
: Merge "Don\'t add Quick Response menu if there\'s no mReplyFromAccount" into jb-ub-mail-ur10
...
* commit '3ddd39b6f1e3bfa0b10443627dd14067502941dd':
Don't add Quick Response menu if there's no mReplyFromAccount
2013-10-31 14:15:46 -07:00
Martin Hibdon
5ed194434f
Add logging to see why attachments fail to load
...
b/11436795
Now, if we ever insert or update an attachment to have
a blank location, we'll log a warning with stack trace.
Also, logging from ADS now uses the same log tag as everything
else, so we'll be able to see it without needing to turn
on some funny log tag.
Change-Id: Ic566cd87e8893128d074b897d7594a01ae12bc8c
2013-10-31 14:11:41 -07:00
Tony Mantler
3ddd39b6f1
Merge "Don't add Quick Response menu if there's no mReplyFromAccount" into jb-ub-mail-ur10
2013-10-31 21:11:32 +00:00
Tony Mantler
b0d82fecff
Don't add Quick Response menu if there's no mReplyFromAccount
...
b/11361756
Change-Id: I880d8f2089c1a50d13367b6fcf64344070280e27
2013-10-31 10:43:29 -07:00
Yu Ping Hu
0fe768e40c
am 6ceae42b
: Merge "Add a provider call to get device friendly name." into jb-ub-mail-ur10
...
* commit '6ceae42b30e03399513b29d401319666915096d5':
Add a provider call to get device friendly name.
2013-10-30 16:10:13 -07:00
Yu Ping Hu
6ceae42b30
Merge "Add a provider call to get device friendly name." into jb-ub-mail-ur10
2013-10-30 23:07:52 +00:00