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
d241290f0b
Add makefile for EmailTests
...
Change-Id: Ic441b5cea9efd0b714a00a69c5b8483ddd11fafa
2013-12-06 17:33:36 -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
7161335e53
Merge "Don't use a loader here, because we'll crash when committing fragment transactions" into ub-mail-master
2013-12-03 23:13:13 +00: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
Yu Ping Hu
2e3751d47d
Reset version code for algol.
...
Change-Id: Ibb319994d32a98cc78ea70f93a29fdc11b64c032
2013-12-03 11:24:55 -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
6b9c648105
am 32786342
: am 6953d595
: Null check service info
...
* commit '32786342d9a297a29193d1c78f931ae064a4aedc':
Null check service info
2013-11-19 17:00:18 -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
Tony Mantler
be08e43d71
am b0638de5
: am 4b629cf2
: Null check certificate alias before trying to configure it
...
* commit 'b0638de59741703d5beea43cff5f0069a4c1f85d':
Null check certificate alias before trying to configure it
2013-11-15 13:46:11 -08:00
Tony Mantler
b0638de597
am 4b629cf2
: Null check certificate alias before trying to configure it
...
* commit '4b629cf25804fd74712b0f7acce1c2e59135b9bf':
Null check certificate alias before trying to configure it
2013-11-15 13:44:17 -08:00
Tony Mantler
4b629cf258
Null check certificate alias before trying to configure it
...
Bug: 11678638
Change-Id: Ia12789ac3553ef959a8c9bbf13f017b1a154f560
2013-11-15 20:51:00 +00:00
Yu Ping Hu
a35bc25cb1
am 583743db
: am bc8bc050
: During upgrade, ignore protocols whose strings don\'t change.
...
* commit '583743db02cad3195a696d547069c831b32693c1':
During upgrade, ignore protocols whose strings don't change.
2013-11-14 18:40:02 -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
Baligh Uddin
2b6e43add4
am 6dae6939
: (-s ours) am 4509ade9
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '6dae6939ef6eb3d709c139e1336191668ba4acaa':
Import translations. DO NOT MERGE
2013-11-13 21:00:48 -08:00
Baligh Uddin
542349b4e4
am 624ca5e2
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
...
* commit '624ca5e2a3ff3276c2aab02fd3ef0957b63eda85':
Import translations. DO NOT MERGE
2013-11-13 20:57:42 -08:00
Baligh Uddin
6dae6939ef
am 4509ade9
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '4509ade9374245f480d85ae0380da4236dea211e':
Import translations. DO NOT MERGE
2013-11-13 20:57:34 -08:00
Baligh Uddin
624ca5e2a3
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-11-14 04:55:21 +00:00
Baligh Uddin
4509ade937
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-11-14 04:55:17 +00:00
Baligh Uddin
b62e121092
Import translations. DO NOT MERGE
...
Change-Id: I06e79c0df62be662d7b0896727afbae41a453cfd
Auto-generated-cl: translation import
2013-11-13 19:54:55 -08:00
Baligh Uddin
4252a00d14
Import translations. DO NOT MERGE
...
Change-Id: If5eccf3f6db2ff03b57ec1a1687af73e8df08edc
Auto-generated-cl: translation import
2013-11-13 19:53:25 -08:00
Yu Ping Hu
edd5933d99
am 2d19b5d0
: am 8fde9e27
: Merge "Check for ArrayIndexOutOfBoundsException" into jb-ub-mail-ur10
...
* commit '2d19b5d08f65dd9f37362c5a15ec01860a7cb4de':
Check for ArrayIndexOutOfBoundsException
2013-11-13 17:28:46 -08:00
Yu Ping Hu
5dda0438c9
am 3d899bce
: am fabb15fa
: Merge "Add fallbacks if sentDate is not set" into jb-ub-mail-ur10
...
* commit '3d899bcebe2f7e7de38f1ebee7e2c2cb7eece744':
Add fallbacks if sentDate is not set
2013-11-13 17:28:43 -08:00
Yu Ping Hu
2d19b5d08f
am 8fde9e27
: Merge "Check for ArrayIndexOutOfBoundsException" into jb-ub-mail-ur10
...
* commit '8fde9e27f86ec00e52dcecdd76ee276a4244a2f4':
Check for ArrayIndexOutOfBoundsException
2013-11-13 09:35:48 -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
8fde9e27f8
Merge "Check for ArrayIndexOutOfBoundsException" into jb-ub-mail-ur10
2013-11-13 17:32:14 +00: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
Alon Albert
cde694c5e1
Check for ArrayIndexOutOfBoundsException
...
Quoted text pos may be out of bounds of message body.
This may be caused by the pos being calculated in html while the message is being
sent as plain text. A seperate CL will attempt to address the root cause. This
is a last resort so we don't crash.
Bug: 11538910
Change-Id: I326ebe56ee15368983caa2fa76605e7658dab014
2013-11-12 15:33:45 -08: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
f0c1242294
am 19591ef0
: am ad0e4288
: Merge "Fix an infinitely retrying download problem" into jb-ub-mail-ur10
...
* commit '19591ef035d5cfdcaa22e6eaa9e7e36cfa848bb5':
Fix an infinitely retrying download problem
2013-11-12 11:35:30 -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
a7a112b496
am cb7fcefd
: am 99ee8eb0
: Merge "Null check for getServiceInfo" into jb-ub-mail-ur10
...
* commit 'cb7fcefde833effb3927ae9f1bd3091dd288a5ee':
Null check for getServiceInfo
2013-11-12 11:10:15 -08:00