Commit Graph

9653 Commits

Author SHA1 Message Date
Tony Mantler
aaa5b71cec Split AccountSetupNames into Activity and Fragment
Change-Id: Ie42bbbc0c5a4cc5402d6df2837894b5eddd52501
2013-12-16 14:52:32 -08:00
Baligh Uddin
f9b521391b Import translations. DO NOT MERGE
Change-Id: I81d7c513dfd9428d33c00ff27803c4d480131d18
Auto-generated-cl: translation import
2013-12-16 13:38:27 -08:00
Baligh Uddin
5e4b0e985a Import translations. DO NOT MERGE
Change-Id: I88233ebb9c7ef1e36d94906b13d3b5b905019f9f
Auto-generated-cl: translation import
2013-12-16 13:37:09 -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
Martin Hibdon
05723aa0f6 Don't put Credentials in HostAuth parcels
The problem is that exchange isn't compiled with this
change, so HostAuth parcels to or from exchange fail.
Ultimately, we'll need to probably create a HostAuth2
object or something along those lines. For now, just
change the format of HostAuth parcels back, so they
stay compatible with exchange, I'll figure out a real
solution later.

Change-Id: I9c8c8639b7b474fe82dfdc37a9e51a0451820105
2013-12-10 17:12:00 -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
76d90334ed Merge "Update version number" into ub-mail-master 2013-12-10 00:50:20 +00:00
Martin Hibdon
af7f7130fd Update version number
This also changes the version number format. Instead
of being a single increment each time, we're actually
encoding the date in the version number.

The format is now vvMMDDc

where vv is major version number
MM is the ordinal month number. This starts at 0 for each major release and
   counts up for each month
DD is the day of the month
c is a code which increments per version, in case we have multiple releases
   on the same date. This should start at zero.

Change-Id: I006745754614e9c72261035748a90a38871b67e6
2013-12-09 16:49:12 -08: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
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