Commit Graph

4516 Commits

Author SHA1 Message Date
Martin Hibdon
23ff99df9d Merge "Fix IMAP message upsync to include attachments." into ub-mail-algol 2014-03-27 21:30:08 +00:00
Tony Mantler
38f9991634 Fix IMAP message upsync to include attachments.
b/13138456

Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
(cherry picked from commit 0c8696c2eb)
2014-03-27 21:23:32 +00:00
Martin Hibdon
e5d754e16c Fix a NPE trying to download an attachment
b/13642247

Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
(cherry picked from commit adabb4285b)
2014-03-27 21:22:28 +00:00
Anthony Lee
30dc25c390 am 41e3f37b: Merge "b/13659097. Disable EAS Policy max attachment size from EmailProvider." into ub-mail-algol
* commit '41e3f37b501ea787c6569f4ac22a11d269dd6557':
  b/13659097. Disable EAS Policy max attachment size from EmailProvider.
2014-03-27 18:46:13 +00:00
Anthony Lee
a68ab80305 b/13659097. Disable EAS Policy max attachment size from EmailProvider.
Disable the code that translates the max attachment size column of
our db to the EmailProvider max attachment size column. They mean
different things as our max attachment size column refers to the max
size of any file that we can download where the EmailProvider's version
represents the max attachment size of a file that we can upload.

Change-Id: I93202766d7b1782c902f17ce20b2823aaf647ec4
2014-03-27 11:37:41 -07:00
Tony Mantler
2be297f1ba Merge "Fix IMAP message upsync to include attachments." into ub-mail-master 2014-03-26 19:53:57 +00:00
Tony Mantler
0c8696c2eb Fix IMAP message upsync to include attachments.
b/13138456

Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
2014-03-26 11:49:38 -07:00
Martin Hibdon
77ba9a751f Merge "Minor formatting change" into ub-mail-master 2014-03-26 18:03:09 +00:00
Martin Hibdon
64b4f7dcff Minor formatting change
b/13642247

Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
2014-03-26 10:47:54 -07:00
Martin Hibdon
a44a63e273 Merge "Fix a NPE trying to download an attachment" into ub-mail-master 2014-03-26 17:46:58 +00:00
Martin Hibdon
adabb4285b Fix a NPE trying to download an attachment
b/13642247

Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
2014-03-26 10:38:51 -07:00
Andy Huang
5687c6dade tighten inline attachment view intent builder
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
2014-03-25 13:30:16 -07:00
Martin Hibdon
3f4a556d54 Fix Calendar and Contacts syncing for POP and IMAP accounts
b/11818312

Change-Id: I34b82040991506bf9099cc0df237454a8f97c764
2014-03-24 17:17:05 -07:00
Martin Hibdon
3021a60bc7 Merge "Only make Calendar and Contacts syncable on Exchange" into ub-mail-master 2014-03-20 19:57:05 +00:00
Martin Hibdon
6a51abdf6e Only make Calendar and Contacts syncable on Exchange
b/11818312
We were using the existance of OPTIONS_CALENDAR_SYNC in the
bundle to indicate that syncing was possible, and it's value
to indicate whether automatic syncing should be enabled.
This is misleading.
Now, we check the serviceInfo for the account type to figure
out if sync calendar and contacts is possible, and use the
options passed in to indicate whether or not it should be
automatic.

Change-Id: I776519668c6630dc71153fb008218a7ca6357c74
2014-03-20 12:47:36 -07:00
Anthony Lee
eba80c114e b/9564335. Add support for a maxAttachmentSize column in the Account
table and connect the data to the Settings object in the existing
location (SettingsColumns.MAX_ATTACHMENT_SIZE).

Change-Id: Iaf48995757511e1dfb65aa35ff6d81bbc47187bd

Conflicts:
	src/com/android/email/provider/DBHelper.java
2014-03-19 17:33:29 -07:00
Yu Ping Hu
8103f960d0 Add sync to IEmailService.
This supports the EasService design.

Yes, I just removed a startSync function from this interface last month. No,
I didn't quite know at the time that I'd be adding one back. :)

Change-Id: I19d9c7838473d8982560764fdba0056cba03d132
(cherry picked from commit 4a5b11d650)
2014-03-20 00:11:36 +00:00
Anthony Lee
70cb2878d7 Changed the IEmailService interface to accept and accountId in
the loadAttachment() call. This work was necessary to support
the new EasService & EasOperation infrastructure.

Change-Id: Idd507aec999596ccd4afa5f03ff2b3c2e38a9029
(cherry picked from commit efac8255ed75d22e60036e19e7a95f8407d18ad3)
2014-03-19 23:53:28 +00:00
Yu Ping Hu
701134953e Add pushModify to IEmailService.
This call lets the service know that the push settings for an
account have changed.

Change-Id: I7ed41853df6af6762c80283a2a3510ce41551657
(cherry picked from commit 446136a2278652c627068ecddff534de1ad431ab)
2014-03-19 23:51:14 +00:00
Tony Mantler
c90680915d Merge "Fix setup flow dialog dismissal" into ub-mail-master 2014-03-19 23:35:36 +00:00
Yu Ping Hu
f679cd08d1 Delete unused functions from IEmailService.aidl.
Change-Id: I131d2d3436a50c94d664fc57c6514481d9afbc97
(cherry picked from commit 8ff6c107867bc2044ba50cad010dbf4a2e93436e)
2014-03-19 22:35:47 +00:00
Tony Mantler
254dde761f Fix setup flow dialog dismissal
Also remove redundant ok/cancel strings

b/13512724

Change-Id: Idfc7745fbf6a08f09051eb4a6154fc446b43eb67
2014-03-19 15:23:56 -07:00
Tony Mantler
cc82c7bae2 Fix IME "Next" button handling in credentials screen
b/13544867

Change-Id: I63ba680a5551dd4bd860026b9110b20a2ae080b6
2014-03-19 11:13:04 -07:00
Tony Mantler
e93b81a51a Merge "Fix back button handling on protocol choice screen" into ub-mail-master 2014-03-19 17:25:47 +00:00
Tony Mantler
b5a4433798 Fix back button handling on protocol choice screen
b/13543514

Change-Id: I27078220aca60ac5137fc69e34e52937313602c9
2014-03-19 10:09:24 -07:00
Tony Mantler
d90643c732 Move credential population to after we collect credentials
b/13512724

Change-Id: I2df8064fc392a928d77291aa41630e4715bedc39
2014-03-18 16:46:33 -07:00
Tony Mantler
452744474a Fix broken tests and remove dead code
Change-Id: I3ae31c604c86641622f997915dc7d86bf2c662a2
2014-03-18 13:57:11 -07:00
Tony Mantler
ae980cd685 Account setup flow: Move button and headline handling into fragments
b/13508015

Change-Id: I9f7a09467fbee5a57985f36eaa47c2cc7b9d4086
2014-03-17 16:45:47 -07:00
Tony Mantler
7fbf3ac6d1 Merge "Skip protocol choice if user entered from system account manager" into ub-mail-master 2014-03-14 23:11:37 +00:00
Tony Mantler
53b64eee54 Skip protocol choice if user entered from system account manager
b/13475223

Change-Id: Id1ec6259e2b3880f9ce83ffe7795c40aa069466e
2014-03-14 15:48:10 -07:00
Andrew Sapperstein
98ade11ad6 Merge "Send empty data for permalink/clipped fields." into ub-mail-master 2014-03-14 22:16:38 +00:00
Tony Mantler
282edb95a3 Add an alternate force-create account path
Allows auto-filling account details using providers.xml

b/13456413

Change-Id: I1d7f6346e2f1d1cc339610be68ff7194210bc75c
2014-03-13 16:21:06 -07:00
Tony Mantler
250d2f9fb8 Merge "Move protocol selection before credential collection" into ub-mail-master 2014-03-13 22:00:25 +00:00
James Lemieux
2c74c0efae Merge "Move Help & feedback to Nav drawer." into ub-mail-master 2014-03-13 21:45:54 +00:00
Tony Mantler
d2ffe23fca Move protocol selection before credential collection
b/13454985

Change-Id: Iabaf74e3212bb2e3b02e55ec947f0e9a32b597e5
2014-03-13 14:11:06 -07:00
Tony Mantler
f6a945a6cf Clean up cert handling in AccountSetupCredentialsFragment
b/13453003

Change-Id: I87567c7e5cb39c7366c8ed346b0e300c3fc6da16
2014-03-13 11:30:25 -07:00
Tony Mantler
e31979ae2e Tweak conditions for diverting back to the password screen
b/13451098

Change-Id: Id0422342aeac3647324afd8e41f6611069a27aad
2014-03-13 10:56:24 -07:00
James Lemieux
31ce5555b8 Move Help & feedback to Nav drawer.
b/11061485

HELP and SEND FEEDBACK are now the two bottom-most drawer
items in the Navigation drawer when it is present or in
the overflow menu when it is not present.

SEND FEEDBACK still behaves as always.

HELP has been redesigned so that it displays the help
content in a local webview rather than using an external
browser.

Change-Id: I01003f3cd6f8dedbcfb95ae87872968dfc6be48b
2014-03-12 16:56:56 -07:00
Martin Hibdon
351aa25ccb Merge "Add the password failed warning text" into ub-mail-master 2014-03-12 22:21:26 +00:00
Martin Hibdon
40baa96c3f Add the password failed warning text
Now, if you fail to authenticate on the credentials fragment,
instead of taking you to the full accountSetupIncoming,
it just takes you back to the credentials fragment with
a warning that your password is wrong.
Also, make it so that pressing "next" on the password IME behaves
the same as pressing the Next button.

Change-Id: Ice91c842659c33ba6f8ac876356a79265c703e2e
2014-03-12 15:19:11 -07:00
Tony Mantler
cac33a2e91 Allow entry into account settings when inbox is null
b/13436061

Change-Id: I544aa55000a91fe121de9bc7963eb89115d4758d
2014-03-12 15:05:50 -07:00
Tony Mantler
ee9cdebcb2 Merge "When opening account settings, divert to AccountSecurity if needed" into ub-mail-master 2014-03-12 20:53:05 +00:00
Tony Mantler
5ca9d39008 Merge "Centralize EmailServiceInfo retreival and pre-fill data for autodiscover" into ub-mail-master 2014-03-12 20:24:39 +00:00
Tony Mantler
85d2451148 When opening account settings, divert to AccountSecurity if needed
b/12843721

Change-Id: Ic7ae99a8f3ddba33d224387921a90624c37bc8b5
2014-03-11 15:09:37 -07:00
Andrew Sapperstein
07d674f9fe Send empty data for permalink/clipped fields.
b/2887917

Change-Id: I08e0317d3350732c6de9569d67d9a39b1a9ebf2e
2014-03-11 14:30:14 -07:00
Martin Hibdon
658231e207 Add certificate selector to credentials fragment
This doesn't work yet because the account type selection
screen doesn't not currently come up after the initial
setup screen. Also, right now we will always display the
cert selector, regardless of security type, because at
this point in the flow we haven't asked the user for that.

Change-Id: I8b4a13030cd6a4a8b243d7208d8df9798fd24bea
2014-03-11 12:56:51 -07:00
Tony Mantler
dfce22eeb1 Merge "Disambiguate providers between AOSP and EmailGoogle" into ub-mail-master 2014-03-10 22:04:32 +00:00
Tony Mantler
04731178b2 Merge "Populate certificate picker when a cert is present" into ub-mail-master 2014-03-10 21:58:12 +00:00
Tony Mantler
6ecdc18457 Populate certificate picker when a cert is present
Motorola: IKXREL1KK-816
b/13398087

Change-Id: I3b69c780a491808afa0cb3717020f42b41c1c0d7
2014-03-10 14:48:34 -07:00
Tony Mantler
9ef3c8b3f8 Disambiguate providers between AOSP and EmailGoogle
b/13323222

Change-Id: I7d10182973b57e4c2c306739a15237952a7e6c95
2014-03-10 13:01:23 -07:00
James Lemieux
0dffe3afd7 Keep on getting a couldn't sign-in notification
b/11551107

This is caused by ImapConnection.doLogin() only throwing
AuthenticationFailedExceptions and not other varieties of exceptions.

While fixing this bug, I discovered that the ConversationListFooterView
that is displayed in response to a authentication failure contains a
button called "Sign In" that didn't actually do anything. I made it
navigate to the incoming account settings fragment where the user is
free to change the relevant account credentials.

Change-Id: I2c772ecab18f3e57059eceeae01de08f1fdab4c2
2014-03-07 16:38:47 -08:00
Tony Mantler
064726d9f9 Centralize EmailServiceInfo retreival and pre-fill data for autodiscover
b/13341957
b/13356801

Change-Id: I9ed399bd6a695e14cf8019d3f62c7e5753e1f4d8
2014-03-07 14:28:35 -08:00
Tony Mantler
094656be6e Merge "Fix some save/restore state bugs in setup flow" into ub-mail-master 2014-03-07 18:52:24 +00:00
Andrew Sapperstein
b9e4521634 Merge "Support display of chevrons in Email. b/7961430." into ub-mail-master 2014-03-07 18:24:02 +00:00
Andrew Sapperstein
803631497c Support display of chevrons in Email. b/7961430.
Change-Id: I6e19d4a942539f63b9503e1036761758715d3558
2014-03-06 21:46:24 -08:00
Tony Mantler
44020f5e40 Merge "Convert manual setup to a checkbox" into ub-mail-master 2014-03-06 19:25:06 +00:00
Tony Mantler
e8fe78062d Fix some save/restore state bugs in setup flow
b/13335176

Change-Id: Ib7b794149de849112317f9b956e82889ecadf6d0
2014-03-06 10:29:22 -08:00
Tony Mantler
1b6292e2ab Convert manual setup to a checkbox
b/13312261

Change-Id: Ie71666e29f506bc4ca87aad62364592d9aa63c19
2014-03-05 14:10:44 -08:00
Andrew Sapperstein
19b7e95d64 Use BroadcastReceiver to listen for LOCALE_CHANGED
Previously, we used the service to listen to Intent.ACTION_LOCALE_CHANGED.
This never worked because that intent is broadcasted by the system
and so Services will never receive them. Just use the existing forwarding
infrastructure to send the broadcast to the service.

Change-Id: I50ef625804e76e2348d3fe14686778d54463b78d
2014-03-04 15:55:52 -08:00
Tony Mantler
001e4ea42c Fix automatic account creation
b/13105763

Change-Id: Ia3525dfe194ef6ed1528329cf77d64214c81d8cf
2014-03-04 09:54:56 -08:00
Tony Mantler
05f946e6cf Merge "Reset state when we error out of certain actions" into ub-mail-master 2014-03-04 17:31:52 +00:00
Tony Mantler
4b73ce73bf Merge "Get rid of Account#name" into ub-mail-master 2014-03-03 21:08:31 +00:00
Tony Mantler
e6b1575a45 Use email address instead of trying to reconstruct it
b/13280168

Change-Id: I0391dd8c169aa0185c7ff9f79970bcb5595fe84f
2014-03-03 10:52:56 -08:00
Tony Mantler
531b363059 Get rid of Account#name
b/13249115

Change-Id: I810237961f429e1f082925c0c6423ca808d4c8f0
2014-03-03 10:04:26 -08:00
Tony Mantler
34eac10a11 Reset state when we error out of certain actions
b/13249204

Change-Id: I8312d913d5a14bfd7e02f35393cc071ba66225d1
2014-02-28 15:56:55 -08:00
Tony Mantler
5bd639edc5 Set activity result when account is created
So we don't drop out of the app after initial account creation

b/10666403

Change-Id: Ibd9b2c1ac6ee950e6d80f1724f5c7fd989f718b6
2014-02-28 11:33:43 -08:00
Tony Mantler
9e7b850595 Merge "Merge setup fragments under a single activity" into ub-mail-master 2014-02-28 17:11:38 +00:00
Tony Mantler
39d63b746c Merge "Fix sync window preference being added multiple times" into ub-mail-master 2014-02-27 17:25:44 +00:00
Tony Mantler
9ef2c5f2cf Fix sync window preference being added multiple times
Also clean up potential NPE

b/13109860

Change-Id: I46bebd6af6329679af28b6b997cd33fca97376dd
2014-02-26 16:02:12 -08:00
Tony Mantler
76472ae40c Merge setup fragments under a single activity
Change-Id: I10cf8bb9f6bc1a26ea97ae664f0196ae9e9493b5
2014-02-26 13:47:41 -08:00
Tony Mantler
220dc1bf57 Fix IMAP delete handling
When a message is flagged as deleted on the server, but is not yet purged,
we'll see it syncing down with a deleted flag. This change treats that
condition as if the message has been fully deleted.

Also fix a copy/paste error for cleaning up the message modification tables.

b/12367845
b/13137235

Change-Id: Ic741dedc10251775a7afdce171d59efbd2cf1a5f
2014-02-24 10:19:05 -08:00
Tony Mantler
da2582c9f4 Merge "Quit dropping inline attachments on the floor" into ub-mail-master 2014-02-21 20:59:12 +00:00
Tony Mantler
c5685ba600 Fix tests
Change-Id: I89370919dd5a8a129ea946f2d3429f0d4a056eb6
2014-02-21 11:43:19 -08:00
Tony Mantler
16fea4dfc0 Quit dropping inline attachments on the floor
If we have image/* attachments with "Content-Disposition: inline" we would
fetch the images immediately, then drop them on the floor instead of saving
them to the DB.

Add code to catch these attachments and save them.

b/13132802

Change-Id: I5203bb1aa518aa46cdb3a38ead6f79af63b521ac
2014-02-21 11:16:29 -08:00
Martin Hibdon
aab398522a Merge "Fix some broken tests" into ub-mail-master 2014-02-20 00:27:42 +00:00
Martin Hibdon
10c7412555 Fix some broken tests
b/13085182
You can't look up emailServiceInfo for smtp, we don't store that
in services.xml. The thing is, if we're using outgoing settings,
we're always using smtp, which allows oauth.

Change-Id: I5c6032e8d5020ba83fa1c803666b83f134f87f75
2014-02-19 16:17:43 -08:00
Tony Mantler
6c241b9738 Merge "Fix unbounded async task creation in ADS" into ub-mail-master 2014-02-19 19:35:01 +00:00
Tony Mantler
426de73380 Fix unbounded async task creation in ADS
Queue operations through a single ConcurrentLinkedQueue and
service the updates on a single async task to avoid spamming the
async thread task queue.

b/11336926

Change-Id: I8e5c526d61f70fbad0ccef80afd08fc26bb5acf0
2014-02-19 09:48:58 -08:00
Martin Hibdon
7190973877 Fix authentication view
Unfortunately, there are problems with making a single
view handle all kinds of authentication and certificate
selection. The layouts for the account settings screen
on phones versus tablets are just too different. So
now the certificate selection code has moved back to the
fragments themselves, and the authenticationView only
handles passwords and oauth.

Change-Id: I1ef0c69687a00029717b836458c85c1b0667ff95
2014-02-18 14:40:36 -08:00
Martin Hibdon
ad94ecc471 Fix account setup test
Change-Id: I7c1b785e5aa29cc7f47920d857441f1a09f05b21
2014-02-18 12:25:41 -08:00
Martin Hibdon
0962a44fc4 Merge "Update layouts for setup" into ub-mail-master 2014-02-14 23:42:22 +00:00
Martin Hibdon
da9c2d66f6 Merge "Remove some security violating logging" into ub-mail-master 2014-02-14 23:40:13 +00:00
Martin Hibdon
b94bfc31cd Remove some security violating logging
Change-Id: Icf53b132516be5f1b392fb9bd3a8970634212642
2014-02-14 15:36:38 -08:00
Martin Hibdon
8919f5738d Update layouts for setup
Change-Id: I5508f6f8640ffdf60f8d1d7282cc7ed3ce30f86c
2014-02-14 15:29:56 -08:00
Martin Hibdon
b9f8dbce19 Change account settings buttons back to text
We actually only want the nav arrows on initial
account setup, not in regular settings.

Change-Id: I02e153638e5df29c1fd7aa134db36bde9fc0666e
2014-02-14 13:30:02 -08:00
Martin Hibdon
87de90282b Make settings flow work for OAuth
Now the password entry is removed from AccountSettingsBasics,
and the user is taken to either SignInActivity or AccountSetupType
after hitting the next button. This is a lot closer to the
desired setup flow as it allows for oauth signin.

Ideally this is not what we will ship for Algol, but it put us
in a state where we could ship if we had to.

Change-Id: I5b28bccd27c515572e4947ca877bd1772732507d
2014-02-14 11:55:26 -08:00
Martin Hibdon
7b42720199 Fix some more setup layouts
This moves the nav buttons to the bottom of the screen, and
improves tablet layouts.

Change-Id: I20642c81b96307e4f45b1b3ad1337d4ff5aafd2e
2014-02-10 15:45:33 -08:00
Martin Hibdon
0c1617f6aa Fix the layout for the sign-in activity
Now, the forward and back buttons on part of the activity,
like the rest of setup.

Change-Id: I4c94b8e0ad79c972e2f79be67b80d51f2d19ca30
2014-02-10 15:14:56 -08:00
Tony Mantler
cd45d20256 Merge "Fix content observing" into ub-mail-master 2014-02-07 18:44:23 +00:00
Martin Hibdon
3aa8013065 Update some setup layouts to use the new buttons
The layouts are still not all up to spec, but we're using
the right buttons now.

Change-Id: Iba22bb12d45f7510345f801f21cfc79728b314e4
2014-02-06 16:11:50 -08:00
Tony Mantler
d006fc94a8 Merge "Convert MailboxSettings to a fragment and fix threading" into ub-mail-master 2014-02-06 20:00:30 +00:00
James Lemieux
7c413c6d51 Merge "Mail in Sent, Drafts and Outbox should show addressees, not sender." into ub-mail-master 2014-02-06 18:32:31 +00:00
Tony Mantler
0f8d16f56a Fix content observing
b/12834957

Change-Id: I00e2fc48e1d78665e0cdcfc3f4fb483f5a047252
2014-02-05 16:58:54 -08:00
James Lemieux
6f4a9eb876 Mail in Sent, Drafts and Outbox should show addressees, not sender.
b/10847599

This is the second attempt at fixing this bug. The strategy has
changed entirely to accommodate GMail as well as reuse formatting
rules that squish the list of conversation participants into an
abbreviated line for display in conversation lists.

ConversationInfo used to include a List<MessageInfo> which was
used to answer questions about which senders had read which
messages in the thread. This has been removed and replaced with a
List<ParticipantInfo>. The backend should populate that list with
appropriate conversation participants (e.g. recipients of the last
message in the case of Sent, Drafts or Outbox; senders for all
other mailbox types)

Change-Id: I32dcc2a255cccaf06c5976633380b2443729f357
2014-02-05 16:00:58 -08:00
Martin Hibdon
636239f417 Merge "Add sign in Activity" into ub-mail-master 2014-02-05 21:26:03 +00:00
Martin Hibdon
58fbd2a477 Add sign in Activity
This allows the user to choose which type of authentication
to use for existing IMAP accounts.

Change-Id: Ib44364a1059a2c4b8a7a0fa66b14cd042b28770e
2014-02-05 13:10:11 -08:00
Tony Mantler
94456929ff Merge "Enable d@d.d debugging" into ub-mail-master 2014-02-04 20:53:12 +00:00
Tony Mantler
d88f132147 Don't try to toggle next button state when the fragment isn't attached
b/12886252

Change-Id: Ie19d8e946139d317f7e867449141dcfd82c510f8
2014-02-04 10:03:08 -08:00
Tony Mantler
70f25e15c9 Enable d@d.d debugging
Change-Id: I16fee21f3b7af0ae653580b5c0fd8b1da6a5d3ae
2014-02-04 09:51:52 -08:00
Tony Mantler
10e9bd96de Convert MailboxSettings to a fragment and fix threading
b/12838753

Change-Id: I58ae069e2e2860c0f7919f44ce125b0c3aad1969
2014-01-31 13:15:42 -08:00