Commit Graph

4444 Commits

Author SHA1 Message Date
Tony Mantler
7e4daecc9a Merge AccountSetupNames and AccountSetupOptions
Change-Id: I5946e90e56b1fc725522d41e2e33d8125900a871
2014-01-16 14:18:58 -08:00
Tony Mantler
bc089edacf Merge "Split AccountSetupOptions into Activity and Fragment" into ub-mail-master 2014-01-13 19:16:03 +00:00
Tony Mantler
499ac7b063 Split AccountSetupOptions into Activity and Fragment
Change-Id: I995c24315a26d14fbff9f1acd1bb7711403f418c
2014-01-10 16:43:36 -08:00
Martin Hibdon
d710956640 Merge "Allow the quick response fragment to be displayed" into ub-mail-master 2014-01-09 22:06:16 +00:00
Martin Hibdon
0c7ff00df4 Allow the quick response fragment to be displayed
b/12442602

Change-Id: Iebd3ea3cd7b4120ae1690f8aba25d78e03d64b58
2014-01-09 13:58:16 -08:00
Martin Hibdon
6ae3bbfb72 Merge "Fix an oversight that wouldn't let us use oauth for dasher" into ub-mail-master 2014-01-09 21:52:36 +00:00
Tony Mantler
f8b253d564 Merge "Split AccountSetupBasics into Activity and Fragment" into ub-mail-master 2014-01-09 21:51:07 +00:00
Martin Hibdon
3cba65acec Fix an oversight that wouldn't let us use oauth for dasher
b/12457993

Change-Id: I1ec31a17e292a76b26db5b5e75c51929d38c1f2d
2014-01-09 13:43:40 -08:00
Martin Hibdon
c9ee5a389a Fix a crashing log line
b/12471608

Change-Id: I6d78c21c362f83322bf156e59ccb0935ff572772
2014-01-09 11:30:23 -08:00
Tony Mantler
9fad8219da Split AccountSetupBasics into Activity and Fragment
Change-Id: Ib002d84497517b2e5687515693c0e1085b110c85
2014-01-08 15:50:42 -08:00
Martin Hibdon
3f1d67533b Merge "Fix a privacy violating log" into ub-mail-master 2014-01-08 18:07:38 +00:00
Martin Hibdon
4e952d9cf4 Fix a privacy violating log
Change-Id: I0c49fde90e4c14e6751a927d0963533092fbef52
2014-01-08 09:30:16 -08:00
Martin Hibdon
afecc01461 Add some logging to figure out why oauth signup fails
Change-Id: Ie706c54c1fb78c4da94cea091201d715251e1c46
2014-01-07 17:29:23 -08:00
Andrew Sapperstein
e684f7d03c Merge "Support inline image UI changes in Email b/5555553" into ub-mail-master 2014-01-08 00:56:09 +00:00
Martin Hibdon
78d168c19d Fix a crash bringing up settings
Change-Id: If29fc7a4113ed7245cd82e6b26c63f08f4b9db2d
2014-01-07 16:41:43 -08:00
Martin Hibdon
bc5a832da1 Allow oauth to be used for any account
This is needed to allow authentication for dasher accounts.

Change-Id: Ic743cf5e027cb9dfbc85896ebae975a3ea40d7bc
2014-01-06 15:41:45 -08:00
Tony Mantler
e31fe0d47b Typo: CONVERSATION_PROJECTION_QUERY_CURSOR_WINDOW_LIMT
Change-Id: I5e28bc618a38e12f171b12f71352838b4f27dbbc
2014-01-03 15:44:12 -08:00
Martin Hibdon
37e2cbb005 Merge "Fix a case that would leak connections if an exception happens" into ub-mail-master 2014-01-03 22:47:20 +00:00
Martin Hibdon
9fe8131c3f Fix a case that would leak connections if an exception happens
Change-Id: I9f50911344e04f22e15bf9ba0c95f4e1b1422923
2014-01-03 14:33:28 -08:00
Martin Hibdon
e8eb6e659b Make OAuth work
Now you can authenticate your account using oauth
for google hosted accounts (e.g. google.com, gmail.com)
The setup ui is still not up to spec.

Change-Id: Ib2826653550a823b4d1b8739c1e483746cccbc22
2014-01-03 14:05:46 -08:00
Martin Hibdon
ff1ee36cb5 Close Imap connections when we are done using them
Also, clean up when we create and lose track of ImapStores.
Prior to this we were creating them often, and losing track of them,
which renders useless a lot of the complex logic in ImapStore devoted
to reusing connections.

Change-Id: I771d4e46d0c1cb9b605c43d9cbae6e52f5894745
2014-01-03 14:01:04 -08:00
Martin Hibdon
5f4fb9bb14 Merge "Close Imap connections when we are done using them" into ub-mail-master 2014-01-03 21:59:34 +00:00
Tony Mantler
885ec98307 Merge "Split AccountSetupNames into Activity and Fragment" into ub-mail-master 2014-01-03 20:57:01 +00:00
Andrew Sapperstein
aef86e3501 Support inline image UI changes in Email b/5555553
A small CL to make sure email keeps compiling
and has the same behavior as before.

If Email wants to support long press to view image,
additional work needs to be done on the email side
in order to enable the full functionality.

Change-Id: I8e7cbdf2a2eee452fe9597097b77db5c8052d7fe
2014-01-03 11:12:14 -08:00
Tony Mantler
129e122608 Merge "Disable the compose activity when there are no accounts configured" into ub-mail-master 2014-01-03 18:31:34 +00:00
Tony Mantler
82b784b7c1 Merge "Re-background loading in AccountSecurity" into ub-mail-master 2014-01-03 18:30:59 +00:00
Martin Hibdon
6348f97c4b Merge "Fix a crash when bring up settings" into ub-mail-master 2014-01-03 17:42:54 +00:00
Martin Hibdon
15b06c2080 Fix a crash when bring up settings
It is now required that any activity that extends
PreferenceActivity implement isValidFragment.

Change-Id: I3ef79430b7f176186493bd09af693b48f8c040a1
2014-01-03 09:30:44 -08:00
Martin Hibdon
5de5354918 Update some error logging
Now it logs stack traces of exceptions, and does not use
exception.toString() as the format specifier, which can be
dangerous.

Change-Id: If841426067017c574c4aff88b8d8ae6b49ee867a
2014-01-03 08:54:34 -08:00
Tony Mantler
00219e9fb9 Make the notification coalescence set thread-local
b/12197387

Change-Id: I36e49f43fa405e14bf507ef46e0d7c825240b628
2014-01-02 16:16:08 -08:00
Tony Mantler
65b3850706 Set image loading to "ASK_FIRST" for all accounts
b/12217358

Change-Id: If3664c29e5920f29a2bba0136d61ac5c0a2fe0dc
2013-12-19 09:50:01 -08:00
Tony Mantler
dc7fe8964c Disable the compose activity when there are no accounts configured
b/10042454

Change-Id: I45767d3e727b4c1fe858d80ca2e063b491827302
2013-12-17 14:24:37 -08:00
Tony Mantler
2d92d29c9f Clean up unused variables, sprinkle in some finals
Change-Id: I16126bbe2c56b63b332c3871f0e0731ae7940b55
2013-12-17 11:31:28 -08:00
Tony Mantler
d7655067e4 Re-background loading in AccountSecurity
This time use a loader and post from onLoadFinished

b/11987449

Change-Id: Ibf64dbb6aebad4d5d7d8ee8cdb0980240b86ec35
2013-12-16 15:47:58 -08:00
Tony Mantler
aaa5b71cec Split AccountSetupNames into Activity and Fragment
Change-Id: Ie42bbbc0c5a4cc5402d6df2837894b5eddd52501
2013-12-16 14:52:32 -08:00
Tony Mantler
b9d071a493 Null check cursor
Mock provider is returning null on this query in testing.

b/12085240

Change-Id: Ifa5edc03707a6050acdbd5184a44409d46004e7e
2013-12-13 13:44:05 -08:00
Jerry Xie
2bf9590ddd Fix SQLite update query
Change-Id: I54a5e2f29e1e171901e7087e27d132256460f0f5
2013-12-10 16:46:45 -08:00
Tony Mantler
b14f1a45a8 Merge "Convert SetupData into a retained fragment" into ub-mail-master 2013-12-10 19:24:16 +00:00
Martin Hibdon
44a6fc31a2 Merge "Allow database to hold oauth credentials" into ub-mail-master 2013-12-10 00:27:32 +00:00
Martin Hibdon
0b25179dab Allow database to hold oauth credentials
Change-Id: I127297fd78c7676995f1dcfa59fbbcafe4e72e8e
2013-12-09 16:18:28 -08:00
Tony Mantler
9c8c471f97 Convert SetupData into a retained fragment
This will keep it from being recreated quite as much while off-thread tasks are possibly mutating it.

Change-Id: Ic9873489906339c33a76b8a600c0fc28016debc4
2013-12-09 12:02:12 -08:00
Tony Mantler
471e792ab4 Merge "Pass projection into getVirtualMailboxRow() and getVirtualMailboxCursor()" into ub-mail-master 2013-12-09 18:45:58 +00:00
Tony Mantler
e046d47c53 Pass projection into getVirtualMailboxRow() and getVirtualMailboxCursor()
b/10912870

Change-Id: Ief5137d113e91ee66318effdf4359629a8133131
2013-12-09 10:39:18 -08:00
Tony Mantler
10a5f9dba0 Merge "Make intents more explicit" into ub-mail-master 2013-12-09 18:28:59 +00:00
Tony Mantler
1644749d1b Merge "Clean up dead/weird code." into ub-mail-master 2013-12-09 18:22:08 +00:00
Tony Mantler
fb9deb96c3 Make intents more explicit
also fix intent strings.

Change-Id: I880fd6cd6192ae43002e1ddc8558f823141c5952
2013-12-09 10:18:34 -08:00
Tony Mantler
a4436636ba Merge "Coalesce notifications while in applyBatch" into ub-mail-master 2013-12-09 18:06:31 +00:00
Martin Hibdon
c35e5257d8 Merge "Add temporary code to do oauth authentication" into ub-mail-master 2013-12-09 00:43:56 +00:00
Martin Hibdon
874d25ff70 Add temporary code to do oauth authentication
This just adds an oauth button to the accountSetupBasics
screen, which will launch a webview and go to the google
authentication page.

Change-Id: I09d5182fa6081fb94b40e7910b71afbbee70387e
2013-12-06 17:39:23 -08:00
Jerry Xie
b174976d59 Merge "Get Email units to compile" into ub-mail-master 2013-12-05 22:04:13 +00:00
Jerry Xie
17d3a29c9d Get Email units to compile
Change-Id: I171a0e2421c5006d9862ad94f886932146547020
2013-12-05 11:11:21 -08:00
Martin Hibdon
5632d4449b Merge "Add configuration for oauth providers" into ub-mail-master 2013-12-04 00:29:17 +00:00
Martin Hibdon
e62688f0d6 Add configuration for oauth providers
There is now an xml file that holds parameters for oauth
providers, and entries in providers.xml can specify that
they can use oauth.

Change-Id: Ibce5b207f83ce9c773f8f713be9e73bb068070ed
2013-12-03 16:27:08 -08:00
Tony Mantler
da6848056c Don't use a loader here, because we'll crash when committing fragment transactions
TODO: Fix the foreground provider calls later.

b/11972196

Change-Id: I0af6455447a2b37ff08c449efc1abf508254df19
2013-12-03 13:50:56 -08:00
Tony Mantler
57a821368a Retrieve the user's real name from the system
Also use a loader instead of an async task.

Change-Id: Ie9c033be0807bebdb559d9ce255a49b52a00134a
2013-12-02 13:34:44 -08:00
Tony Mantler
34662f11b2 Save policy when saving account
Also add a loader to AccountSecurity, and ignore when a policy contains unsupported requirements.

b/11790165

Change-Id: Idd651153848eea3216656047c5aba3bbd750ca0a
2013-11-27 14:42:49 -08:00
Yu Ping Hu
a702a7bbd8 Merge "Fix account deletion when removing security policies." into ub-mail-master 2013-11-25 23:38:03 +00:00
Yu Ping Hu
a60550e0eb Fix account deletion when removing security policies.
- Delete accounts, not just account data.
- Wait for PIM data to get deleted before proceeding.
- Reconcile after deleting an account.

Bug: 11856902
Change-Id: Ie52b7c583688bf48a33bcf6b4e555b8c055b476c
2013-11-25 12:50:28 -08:00
Tony Mantler
c80688903d Line length
Change-Id: I50cf8aef2de5ec490cc081a1c67e6f3727b15cb1
2013-11-22 16:08:06 -08:00
Tony Mantler
5ec2108cf0 Clean up dead/weird code.
Change-Id: I27da217fc919bee6804b12ee8ec5f5a78b1ee410
2013-11-22 10:36:09 -08:00
Tony Mantler
8196f82ce2 Use update notification intent to trigger notifications
This ensures the SuppressNotificationReceiver object quiesces the notification while we're viewing the folder

b/11789666

Change-Id: I98f388844b29458e7ea7deee398f7d8536b1919c
2013-11-21 13:18:57 -08:00
Tony Mantler
32786342d9 am 6953d595: Null check service info
* commit '6953d5951fed975d2569ec46bd544ce21e6860dc':
  Null check service info
2013-11-19 16:56:58 -08:00
Tony Mantler
6953d5951f Null check service info
b/11754422

Change-Id: Iae3c87c894eb3d16880768a3b8894e43d75a5878
2013-11-19 15:45:07 -08:00
Yu Ping Hu
583743db02 am bc8bc050: During upgrade, ignore protocols whose strings don\'t change.
* commit 'bc8bc050b080287c35241f5ab0c310bbbdb6e805':
  During upgrade, ignore protocols whose strings don't change.
2013-11-14 18:38:04 -08:00
Yu Ping Hu
bc8bc050b0 During upgrade, ignore protocols whose strings don't change.
Copied from https://googleplex-android-review.googlesource.com/#/c/389215/
in order to submit for ur10, also made a minor change to early out when
we know it's a no-op.

Bug: 11258856
Change-Id: I28415e97225a216c16abb6ad7c48a860c5370173
2013-11-14 18:19:12 -08:00
Tony Mantler
05649dca2f Coalesce notifications while in applyBatch
Also divert all notifications through notifyUI()

Change-Id: If3b1ee05a8933bed5718e7b90137dbb0139a761a
2013-11-14 10:39:21 -08:00
Yu Ping Hu
3d899bcebe am fabb15fa: Merge "Add fallbacks if sentDate is not set" into jb-ub-mail-ur10
* commit 'fabb15fafe32ead0a84c7970ed390baaa81cd7c9':
  Add fallbacks if sentDate is not set
2013-11-13 09:35:47 -08:00
Yu Ping Hu
fabb15fafe Merge "Add fallbacks if sentDate is not set" into jb-ub-mail-ur10 2013-11-13 17:32:06 +00:00
Martin Hibdon
e39f2b0f27 Add fallbacks if sentDate is not set
b/11520812
This should make behavior better if the imap server
does not set the date header.

Change-Id: I593e14ce0a94179a39779ec47831fb8d3caef95b
2013-11-12 11:52:01 -08:00
Martin Hibdon
19591ef035 am ad0e4288: Merge "Fix an infinitely retrying download problem" into jb-ub-mail-ur10
* commit 'ad0e42887f900cc5966ae3a74b4beb903c8c0072':
  Fix an infinitely retrying download problem
2013-11-12 11:32:10 -08:00
Martin Hibdon
ad0e42887f Merge "Fix an infinitely retrying download problem" into jb-ub-mail-ur10 2013-11-12 19:28:59 +00:00
Yu Ping Hu
cb7fcefde8 am 99ee8eb0: Merge "Null check for getServiceInfo" into jb-ub-mail-ur10
* commit '99ee8eb04418ee4797082770f34ada6f96d36bd7':
  Null check for getServiceInfo
2013-11-12 11:07:59 -08:00
Tony Mantler
ea0989043a Null check for getServiceInfo
b/11538007

Change-Id: I8b06f22373c3a389939614e9c24bbe143b6fc289
2013-11-11 15:47:19 -08:00
Alon Albert
0a4debe0a5 am 802bf1b4: Ignore Messsages With No Timestamp
* commit '802bf1b4a7e36caa84d790198abc8421873b821c':
  Ignore Messsages With No Timestamp
2013-11-08 16:57:25 -08:00
Alon Albert
802bf1b4a7 Ignore Messsages With No Timestamp
When calculating oldest local message

Bug: 11520812
Change-Id: I0e70431d57235b5f97a3cd01c35af1b61e3dad7e
2013-11-08 16:20:52 -08:00
Martin Hibdon
272b317f3d Fix an infinitely retrying download problem
b/11436795
If an attachment download fails due to a timeout, or
an exception being thrown from startDownload(), we'd call
cancelDownload() on it. But this didn't actually cancel,
it would remove it from the inProgres list, but leave it
in the list of all downloads, so we'd immediately retry it.
This is bad for two reasons:
1. It can starve out other attachment downloads that could
have been successful.
2. It will keep attempting to do network work, even if it's
hopeless, forever, draining battery.
Now, if an attachment download fails in this way, for the first
few times, we'll move it to the tail end of the list of
downloads we'd like to perform. If it fails more than 10 times,
we'll give up completely. Giving up is not permanent, if we
have a reason to attempt a download again (such as the user
tapping on it), then it will get added back to the download
service and retried.

Change-Id: I5364a7d8b4b25ce299b8dcf061db6e9ce12daf75
2013-11-08 14:05:46 -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
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
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
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
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
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
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
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
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
Tony Mantler
81bedbef2e am 2a33eccd: Merge "Don\'t initiate fragment transactions from onDestroy()" into jb-ub-mail-ur10
* commit '2a33eccd19ac32bb75f419b6379586de903c78af':
  Don't initiate fragment transactions from onDestroy()
2013-10-30 14:15:07 -07:00
Tony Mantler
2a33eccd19 Merge "Don't initiate fragment transactions from onDestroy()" into jb-ub-mail-ur10 2013-10-30 21:12:06 +00:00
Yu Ping Hu
5181cd6d4a Add a provider call to get device friendly name.
For now, it sends the device model name as friendly name, in lieu
of actually having a user-supplied friendly name. This is wrong
for at least two reasons:

1) We need to have an actual user-supplied friendly name, but that's
   not easy to find.
2) This really shouldn't be a provider query -- it should be something
   the Exchange can know locally (ideally this is a system preference
   but that's not currently implemented). This workaround just lets
   us have some reasonable value that we can update easily.

Bug: 11161234
Change-Id: If83ad768736de19c9d0e833d1f86a6ce9daf5039
2013-10-30 11:50:41 -07:00
Alice Yang
8e3bd14c27 Merge "Always ask before displaying images for Email" into jb-ub-mail-ur11 2013-10-30 17:58:20 +00:00
Alice Yang
24a489c3de Always ask before displaying images for Email
In Gmail, we are adding a setting that automatically shows external
images instead of asking user first.  Email app should preserve old
behavior.

Bug 11158252

Change-Id: I8b04a1ec31638d756dfee2da8ab2e8178a709416
2013-10-30 10:07:59 -07:00
Alon Albert
3e8e59798b Null Protect Account Info
Bug: 11355850
Change-Id: Idb42769b3009787efb4edfe2ffbd65171cd8d8d8
2013-10-29 16:47:24 -07:00
Tony Mantler
9460be06aa Don't initiate fragment transactions from onDestroy()
b/10918608

Change-Id: I649c5f86e5f77fa2ade33345969a44ffebb463b9
2013-10-29 15:44:34 -07:00
Alon Albert
ae46818a19 Disable Move Actions for POP3 Folders
Bug: 11311812
Change-Id: I5813281cca76b9b4a373b5b40dbbd1909800f951
2013-10-29 11:06:36 -07:00
Tony Mantler
19b89b4bea Merge "Oh account name/email mixups, I've missed you so (no I haven't)" into jb-ub-mail-ur10 2013-10-25 20:14:38 +00:00
Tony Mantler
20367f1589 Oh account name/email mixups, I've missed you so (no I haven't)
b/11341847

Change-Id: Ib3d13e28f742e6cac84795d46121e4be2994abba
2013-10-25 10:02:06 -07:00
Yu Ping Hu
7b7d7d5cb5 Fix DB upgrade code.
Bug: 11294681
Change-Id: I7333aabbdb9e45154d83386b85398e6d108e5bf2
2013-10-24 19:58:40 -07:00
Yu Ping Hu
66f85c878c Merge "Add an additional mailbox key column to message table" into jb-ub-mail-ur10 2013-10-24 22:59:40 +00:00
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
340a29e5fa Merge "Restore sender snippet for nested folder teaser." into jb-ub-mail-ur10 2013-10-23 22:42:39 +00: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
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
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
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
1fb5fa6981 Merge "Populate real name in From: field" into jb-ub-mail-ur10 2013-10-21 22:46:55 +00: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
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
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
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
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
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
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
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
85d2190552 Clear all "drafts" related flags from email when sending
b/11224331

Change-Id: I1df8ea3e0e24b050cd391dea454124e06988bf7d
2013-10-14 17:42:02 -07:00
Yu Ping Hu
ec0bb58b9a Merge "Fix folder list loading." into jb-ub-mail-ur10 2013-10-14 21:51:14 +00:00
Yu Ping Hu
1004d74f2c Fix folder list loading.
We used to do N+1 DB queries when our list has
N folders in it. Now just do 1 and be smarter about
how we read our values out of it.

Bug: 11112954
Change-Id: Icde0b979ca985e63d6ceba05c3a63f3a9b7e3566
2013-10-14 14:47:33 -07:00
Tony Mantler
efd835acea Fix threading issues in EmailDownloadService
b/7257927

Change-Id: I390ced0eee18ff324032481ae55c31f5d4b26ffd
2013-10-14 12:25:04 -07:00
Martin Hibdon
6df3709128 Merge "Correct syntax for IMAP date range search" into jb-ub-mail-ur10 2013-10-14 04:46:53 +00:00
Martin Hibdon
35cdca3fb4 Correct syntax for IMAP date range search
b/11183568
We were surrounding the data parameters with
double quotes. Apparently some servers do not
accept this, and they aren't present in the
imap spec.
However, we've been running with the quotes
for several months now, and it seems to work
on most servers. I'm afraid of changing this
right now, it might cause other servers to fail.
So now we'll try the query without quotes, and
if we get an exception, fall back to the old
style query with the quotes.

Change-Id: Ifb7b1a6dd4a9f7bb6b38bd1611c64e2bddb2e188
2013-10-13 21:44:52 -07:00
Yu Ping Hu
ac93f838b8 Only fake the footer for mailboxes that sync from server.
Bug: 11193271
Change-Id: I7bc8903889ae4f91065cdb4696128a4eed62844f
2013-10-12 15:15:33 -07:00
Tony Mantler
67e78a67ba Merge "Clean up usage of Account.name when accessing account/folder prefs" into jb-ub-mail-ur10 2013-10-12 01:34:50 +00:00
Tony Mantler
32614f3746 Clean up usage of Account.name when accessing account/folder prefs
b/11185963

Change-Id: Id928732bee5f67887252b1f949a8e4d396fffaa6
2013-10-11 16:44:57 -07:00
Alon Albert
9a342b3147 Cleanup Logs
Bug: 11149133
Change-Id: I764e2e3a8c37769d2e788688cf50789d0f22e9d3
2013-10-11 15:31:24 -07:00
Martin Hibdon
e7f61f403c Merge "Always fix parent keys on startup of email" into jb-ub-mail-ur10 2013-10-11 22:24:34 +00:00
Martin Hibdon
f7078466c3 Always fix parent keys on startup of email
b/11174975
There are already several database fixing steps that
occur when the database is opened, add another one
to correct uninitialzed mailbox parent keys.
This is because we use a two pass system for adding
mailbox rows, first to insert the rows, and second to
assign parentKeys to child rows. We need two passes
because we may insert a child row before its parent,
so the parent's rowId is unavailble. But if the process
dies before the second step is complete we'll be in
an inconsistent state.

Change-Id: Ifaeeaca7e82c1e99656033bc1a9f25d7acb67517
2013-10-11 15:18:41 -07:00
Tony Mantler
ec2b661acb Merge "The ServiceMap caches locale-dependent strings. Destroy it on configuration changes." into jb-ub-mail-ur10 2013-10-11 21:37:44 +00:00
Tony Mantler
03dc3f22d1 Combined account name is locale-dependent. Notify on locale changes
b/10784192

Change-Id: I2a9783f19709ff5cf0ab5a4a14ab1ad60b71d821
2013-10-11 14:20:03 -07:00