Scott Kennedy
048a2956da
Revert "email: add support for Server Name Indication (SNI)"
...
This reverts commit 75cf76875e
2014-04-01 20:21:05 +00:00
Jorge Ruesga
75cf76875e
email: add support for Server Name Indication (SNI)
...
Change the underlaying socket factory reference to SSLCertificateSocketFactory which
has support for SNI since 4.2, and remove the access to the obsolete methods from
the old factory reference.
This change will setup the socket with a proper hostname prior to the ssl handshake.
Change-Id: Ie537b1d8c3da33de3665e481320be134939155ca
Signed-off-by: Jorge Ruesga <j.ruesga.criado@gmail.com>
2014-03-31 10:54:16 -07:00
Tony Mantler
37515ea5f3
am 0ecf8068: Merge "Add giant yellow email logo to account setup screen" into ub-mail-algol
...
* commit '0ecf80685ce776e370444adb1afe3b2317f29de2':
Add giant yellow email logo to account setup screen
2014-03-27 23:01:22 +00:00
Baligh Uddin
3783fa674d
am ba76a96a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol
...
* commit 'ba76a96a6c02f86361b49ef3b1a9eb3f6dc3d73d':
Import translations. DO NOT MERGE
2014-03-27 23:01:20 +00:00
Martin Hibdon
dee5f72aa4
am 699ee651: Merge "Upgrade my logging from .e to .wtf" into ub-mail-algol
...
* commit '699ee651b9fbe0e7de0043cf3f9e0da117946dcc':
Upgrade my logging from .e to .wtf
2014-03-27 23:01:20 +00:00
Martin Hibdon
8fde3ab8c8
am c7031638: Minor formatting change
...
* commit 'c7031638bdf550d8a511a32eac31f41bb566fa65':
Minor formatting change
2014-03-27 23:01:19 +00:00
Martin Hibdon
2a2f00e20d
resolved conflicts for merge of 4d6225d6 to ub-mail-master
...
Change-Id: I27d39707d64972f17e2d84736097d24958239d1b
2014-03-27 15:55:34 -07:00
Martin Hibdon
eabd3df312
am 23ff99df: Merge "Fix IMAP message upsync to include attachments." into ub-mail-algol
...
* commit '23ff99df9dade4246484923505330eb31035328d':
Fix IMAP message upsync to include attachments.
2014-03-27 22:54:03 +00:00
Martin Hibdon
19d11fd6be
am 83f29978: Merge "Increase touch target for adding authentication" into ub-mail-algol
...
* commit '83f29978687d03164d05a43a2d7f58935c818d7d':
Increase touch target for adding authentication
2014-03-27 22:54:03 +00:00
Tony Mantler
0a1af28960
am 2fbddae8: Merge "Remove hairline in account setup flow" into ub-mail-algol
...
* commit '2fbddae8817dab891be29ac4fcb7ba7b00b69a49':
Remove hairline in account setup flow
2014-03-27 22:54:02 +00:00
Martin Hibdon
bdb2e2759b
resolved conflicts for merge of e5d754e1 to ub-mail-master
...
Change-Id: I1de1eebac1f6c68b038e1522012522c5139569fb
2014-03-27 15:50:18 -07:00
Tony Mantler
0ecf80685c
Merge "Add giant yellow email logo to account setup screen" into ub-mail-algol
2014-03-27 22:38:47 +00:00
Baligh Uddin
ba76a96a6c
Merge "Import translations. DO NOT MERGE" into ub-mail-algol
2014-03-27 21:51:21 +00:00
Tony Mantler
c5e07960b6
Add giant yellow email logo to account setup screen
...
b/13677552
Change-Id: Icfd2e878fd62118486c347ae4737c5409a2e5c9b
2014-03-27 14:34:13 -07:00
Martin Hibdon
699ee651b9
Merge "Upgrade my logging from .e to .wtf" into ub-mail-algol
2014-03-27 21:31:43 +00:00
Martin Hibdon
dc0ac5a316
Upgrade my logging from .e to .wtf
...
b/13640564
Change-Id: I360aa6bab99cc1c414b4f89fcfe3c82eb6e282c3
(cherry picked from commit 8eaa3f029e
2014-03-27 21:30:46 +00:00
Martin Hibdon
c7031638bd
Minor formatting change
...
b/13642247
Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
(cherry picked from commit 64b4f7dcff
2014-03-27 21:30:37 +00:00
Martin Hibdon
4d6225d699
Merge "Add logging to help track down a bug causing invalid credentials" into ub-mail-algol
2014-03-27 21:30:15 +00:00
Martin Hibdon
23ff99df9d
Merge "Fix IMAP message upsync to include attachments." into ub-mail-algol
2014-03-27 21:30:08 +00:00
Martin Hibdon
83f2997868
Merge "Increase touch target for adding authentication" into ub-mail-algol
2014-03-27 21:29:58 +00:00
Tony Mantler
2fbddae881
Merge "Remove hairline in account setup flow" into ub-mail-algol
2014-03-27 21:29:53 +00:00
Martin Hibdon
7c8eee40c1
Add logging to help track down a bug causing invalid credentials
...
b/13640564
Change-Id: I1161764e1278375eb786689a11e6899e8363fc8b
(cherry picked from commit 5419284715
2014-03-27 21:25:16 +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
c0707dd3b4
Increase touch target for adding authentication
...
b/13642313
Change-Id: I9681cd6ad21e4da76cac3202dc61bdc49b978c71
(cherry picked from commit 7bf3bb9947
2014-03-27 21:23:19 +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
Tony Mantler
e27e24e9f2
Remove hairline in account setup flow
...
b/13675117
Change-Id: I499929c4b4dd05c26aa24e5bd4c29fd89c6da963
2014-03-27 13:21:55 -07:00
Martin Hibdon
524747f798
Merge "Upgrade my logging from .e to .wtf" into ub-mail-master
2014-03-27 20:19:15 +00:00
Martin Hibdon
8eaa3f029e
Upgrade my logging from .e to .wtf
...
b/13640564
Change-Id: I360aa6bab99cc1c414b4f89fcfe3c82eb6e282c3
2014-03-27 13:17:15 -07:00
Martin Hibdon
d7dbf4201f
Merge "Add logging to help track down a bug causing invalid credentials" into ub-mail-master
2014-03-27 20:05:31 +00:00
Martin Hibdon
5419284715
Add logging to help track down a bug causing invalid credentials
...
b/13640564
Change-Id: I1161764e1278375eb786689a11e6899e8363fc8b
2014-03-27 13:00:25 -07: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
41e3f37b50
Merge "b/13659097. Disable EAS Policy max attachment size from EmailProvider." into ub-mail-algol
2014-03-27 18:41:20 +00:00
Tony Mantler
688418811a
am b45098fb: Merge "Make account setup flow headline grey and skinny" into ub-mail-algol
...
* commit 'b45098fb37e460f4c37c3625517958bef180bee1':
Make account setup flow headline grey and skinny
2014-03-27 18:40:04 +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
b45098fb37
Merge "Make account setup flow headline grey and skinny" into ub-mail-algol
2014-03-27 18:35:13 +00:00
Tony Mantler
3b62bc7029
Make account setup flow headline grey and skinny
...
b/13639943
Change-Id: I1c1fd6c3438baadbc006a1f2c340ab0abbd7b5c1
2014-03-26 16:21:14 -07:00
Tony Mantler
b040379f1b
am b2dbba8d: Christen ub-mail-algol with a new version number
...
* commit 'b2dbba8d9fe12065f56b6c42341fa1075ffba140':
Christen ub-mail-algol with a new version number
2014-03-26 22:22:58 +00:00
Baligh Uddin
aaa1f8cd1d
Import translations. DO NOT MERGE
...
Change-Id: Ifabf8fcf26cf387a2c66a09d1525f636d7fde0f1
Auto-generated-cl: translation import
2014-03-26 15:20:06 -07:00
Tony Mantler
b2dbba8d9f
Christen ub-mail-algol with a new version number
...
Change-Id: Ifdc73fe4354e9e74e9cba9c993051c742efb530f
2014-03-26 15:13:04 -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
Martin Hibdon
7bf3bb9947
Increase touch target for adding authentication
...
b/13642313
Change-Id: I9681cd6ad21e4da76cac3202dc61bdc49b978c71
2014-03-26 12:01:19 -07: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
Tony Mantler
9b0c0f77d9
Merge "Actually install the correct views when credentials fragment is in standalone mode" into ub-mail-master
2014-03-25 23:03:28 +00:00
Tony Mantler
fe7c3228eb
Actually install the correct views when credentials fragment is in standalone mode
...
b/13638835
Change-Id: I7800cf0638097ae70c0b22384e2effc09c6ab2e3
2014-03-25 15:51:06 -07:00
Andy Huang
5687c6dade
tighten inline attachment view intent builder
...
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
2014-03-25 13:30:16 -07:00
Baligh Uddin
085a96040d
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-03-25 19:53:09 +00:00
