Commit Graph

10279 Commits

Author SHA1 Message Date
Tony Mantler
a2f1da2bdc Fix handling AOL's login rejection
Found while investigating b/18031180

b/18049329

Change-Id: I2c86449008fb5e89c84db1a0753b8a61f42305b9
2014-10-20 17:20:59 +00:00
Martin Hibdon
f61e098a41 Correctly update UI_SYNC_STATUS upon search
b/17377040

Change-Id: I5cf9281fa204ac780b737215a86362a8317d63b6
2014-10-16 14:22:49 -07:00
Geoff Mendal
586858745f Import translations. DO NOT MERGE
Change-Id: Ib25f13dd8347d95126da1b6a8c1f21c1470723a5
Auto-generated-cl: translation import
2014-10-15 07:14:56 -07:00
Régis Décamps
2128e36569 Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev 2014-10-15 12:38:35 +00:00
Martin Hibdon
7b44fda91e Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev 2014-10-14 22:59:13 +00:00
Martin Hibdon
79cb83cad1 Set mailbox uiSyncStatus when IMAP and POP folders are created
b/17443087
Now for certain folder types, when they are first created,
the uiSyncStatus is set to NEEDS_INITIAL_SYNC. This prevents
us from displaying the empty state until after the sync has
completed.

Change-Id: Ib04c915f6972ecb75092dd50e90dee8647ee2f64
2014-10-14 15:52:58 -07:00
Tony Mantler
f9757504b6 Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev 2014-10-14 17:27:36 +00:00
Tony Mantler
1d929d18fe Initial account setup analytics
Just activity start/stop.

b/17166224

Change-Id: If100a88d6b6fbe05165aaed90b1caaa9c3db12c3
2014-10-13 15:13:28 -07:00
Tony Mantler
0b9d3de5aa Reload settings immediately after toggling sync
Twiddling the AccountManager bits doesn't automatically trigger a
content update, so we refresh manually in those cases.

b/17330140

Change-Id: I294173c9baca231a6f3ff045d0b7795c6b2b2219
2014-10-13 13:37:21 -07:00
Geoff Mendal
4012d74867 Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 2014-10-13 20:21:17 +00:00
Geoff Mendal
fc3b5cae3b Import translations. DO NOT MERGE
Change-Id: I6b0cf46470c425b2c49207b0294c400476f84bef
Auto-generated-cl: translation import
2014-10-13 12:17:24 -07:00
Rohan Shah
72f6a2432e Revert "Update notification icon asset names (Email)"
Need to revert - doesn't build on Mac OS

This reverts commit cc82965ac9.

Change-Id: I98c03ebe85df29ff146d0cee6ae112ab36e6d8b0
2014-10-13 18:58:56 +00:00
Rohan Shah
cc82965ac9 Update notification icon asset names (Email)
Bug: 17936539
Change-Id: Ia2b3d4a18a30f9cfbfcda2c68a3ef579c0c75086
2014-10-10 15:11:55 -07:00
Martin Hibdon
5fde01e4a9 Merge "Set the search mailbox's syncState as soon as a search is requested" into ub-gmail-ur14-dev 2014-10-10 20:12:43 +00:00
Martin Hibdon
00fbbb24b3 Set the search mailbox's syncState as soon as a search is requested
b/15868294
b/17377040
When we do a search, we clear the current contents of the search mailbox,
and then send a request to whatever service is appropriate (IMAP or
Exchange.) The service then begins a sync and updates the sync state.
The thing is, this leaves a time window when the sync state is still
NONE, but no contents have been loaded yet.
So now, as soon as the search request is made, we set the sync state
to LIVE, then send off the request. That should keep the empty state
view hidden until we actually do the sync.

Change-Id: Ia97e1cf2773db460fdf32aaa45205c4e6034527d
2014-10-10 11:35:27 -07:00
Martin Hibdon
89272781fa EmailProvider now supports query and getType for cached file urls
b/17573792
This is needed so that we can send cached files as attachments.
This case comes up if you edit a draft with an attachment,
view the attachment, and then share that with Email.
Also, update the manifest so that EmailProvider grants
uri permission for cachedFiles.

Change-Id: Ib32ae8360b627823af9361cba05e0e5dbd0ae4ca
2014-10-10 11:17:52 -07:00
Tony Mantler
1927361b25 Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
Régis Décamps
8c0253a1f0 Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev 2014-10-10 15:30:39 +00:00
Tony Mantler
746dcf06db Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev 2014-10-09 18:51:13 +00:00
Tony Mantler
19ebfab06d Restyle account setup flow nav buttons
b/17266006

Change-Id: Ie60e56b493ba23465a06cce8a3c37d3fd9d061e5
2014-10-09 10:38:47 -07:00
Régis Décamps
24f2b19c92 Replace "Corporate" by "Exchange".
Bug: 17925116 Change "Corporate" to "Exchange"
Change-Id: Ia7f8a8c2e393924cf13eb9a0895ae29d8acc7eb4
2014-10-09 18:02:34 +02:00
Tony Mantler
f5b5fe1cb3 Account authentication restyling
- Add minWidth to fragment
- Remove extraneous LinearLayout and tweak margins to avoid layout jumps
- Change + asset
- Remove old + icon from prefs header from Email

b/8134410

Change-Id: If3371017359b47d9e4280b09fd3bb074b024c23c
2014-10-08 15:49:03 -07:00
Geoff Mendal
2a1daaae4d Import translations. DO NOT MERGE
Change-Id: Id77138c228e8a50336b8a9c6fce144b659fa6d29
Auto-generated-cl: translation import
2014-10-08 10:15:55 -07:00
Régis Décamps
ac03b55765 Resend notifications when Accounts are changed
When AccountManager notifies of account change, resend notifications
because the existing ones can point to an account that doesn't
exist anymore.

Bug: 17713589 Gmail crashes when accessing an old notification for an account that has been deleted.
Change-Id: I6c2cf5234006f4859fea5bbaa52970963bcfccdd
2014-10-08 13:27:00 +02:00
Baligh Uddin
ab3ed2cb7a Import translations. DO NOT MERGE
Change-Id: Id23c1d0e3e726ce009fd7c68e2a2cbd29c545466
Auto-generated-cl: translation import
2014-10-02 20:30:11 -07:00
Martin Hibdon
46f1b89fef Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev 2014-10-03 02:14:01 +00:00
Anthony Lee
ec8c2ac9df Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev 2014-10-02 22:36:58 +00:00
Anthony Lee
824a80491c Calculate available background threads for AttachmentService correctly.
Also iterated on some logging to help debug Attachment issues:

Bug: 17789960
Change-Id: I77331f9a41f5c95ed228e8ca5fd36a66db5b78ee
2014-10-02 15:29:03 -07:00
Martin Hibdon
601700a61e Get SSLSocketFactory from GmsCore
b/15721931
This follows an example pattern from GoogleHttpClient.
It tries to get the SSLCertificateSocketFactory from
GmsCore using reflection. If that fails, (because GmsCore
is not installed on the device) then it will fall back
to the platform implementation.
MailApplication sets a static object in SSLUtils that
allows it to get an externally created SSLCertifcateSocketFactory.
If this method is set, then it will use it, otherwise it
will fall back to the platform factory. This way there
is no reference to GmsCore in the AOSP email.

Change-Id: I0890fe4c3d79283fb98a4dc5a62a32efd320e52a
2014-10-02 10:54:52 -07:00
Rohan Shah
42a4f20120 Move Email Icons (Email)
Got rid of ic_launcher_mail from Email folder (moved to
UnifiedEmail).

Bug: 16632478
Change-Id: I4ee261fb31afab7bcec7300315b1631910f27231
2014-10-02 10:38:21 -07:00
Rohan Shah
083a013826 Merge "Update Email Icons" into ub-gmail-ur14-dev 2014-10-02 00:46:45 +00:00
Rohan Shah
49dfa15527 Update Email Icons
Added icons with the light, subtle shadows.

Change-Id: Ib3c3893e6b099ea73f1ce5d925c28933b241f544
2014-10-01 17:44:40 -07:00
Rohan Shah
36830d42f8 Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev 2014-10-02 00:29:09 +00:00
Rohan Shah
f22745169c Revert "Clean-up Email Icons"
Need to update Email icons only (Unnecessary work added on for cherry-picking)

This reverts commit 11f5e48526.

Change-Id: Id4a87d7bc73eb91c284661dbffb0d03a73a4e34c
2014-10-02 00:26:55 +00:00
Rohan Shah
6a533823f3 Merge "Clean-up Email Icons" into ub-gmail-ur14-dev 2014-10-01 23:22:52 +00:00
Rohan Shah
11f5e48526 Clean-up Email Icons
Around 2012, icons were submitted into the wrong folders.
Moved these out into UnifiedEmail.

Discovered as a result of shortcut CL - tagging the bug
in case any changes occur in the future.

Bug: 16632478
Change-Id: I2115f9324003a5c4d3e35b9e155405c377522a60
2014-10-01 15:44:17 -07:00
Tony Mantler
b62067e3c3 Make sure old body files don't contaminate new messages
If we have an error writing an old body file and overwrite the same ID,
we might end up in a situation where we have HTML from one message and Text
from another. Clean up the body files before insert to avoid this.

b/17720266

Change-Id: I2fb18fa24c6f3bc01e7c877e2f3bfccee6a34015
2014-10-01 14:02:17 -07:00
James Lemieux
69ba565b62 Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev 2014-09-30 23:11:37 +00:00
James Lemieux
aa2ca51477 Combined view should also display client-side sanitized HTML
b/16206516

Change-Id: I23385f2c29a55a155a4842226d4f1f37943338d2
2014-09-30 14:17:23 -07:00
James Lemieux
40236a8931 Display sync errors using snackbar and not as a TL footer
b/16463253

The FAB compose button overlaps the action button found in the TL footer
when network errors occur during sync. To avoid this overlap, the snackbar
is used to display these errors and they no longer appear as a TL footer.

In order to signal the sync error to AAC for display in the snackbar, the
Folder.lastSyncResult needed to be encoded in the manner that AAC reads.
This was not happening for POP/IMAP/Exchange accounts, so a large portion
of this change is encoding that value properly every place it is written.

To ensure the value is read/written properly everywhere, common methods were
introduced in UIProvider that do this work. UIProviderTest was also added
to ensure the read/write methods agree with each other.

Finally, the display of the "Load More" TL footer was updated to match the
latest spec.

Change-Id: I9d3ae1157f288f05b0fed4d1385858f6c9ebfbf9
2014-09-29 17:51:27 -07:00
Baligh Uddin
abd75d1adb Import translations. DO NOT MERGE
Change-Id: I05757a0df1ee5bbffcbe6dff1b0856b1a4bba19a
Auto-generated-cl: translation import
2014-09-29 14:41:16 -07:00
Régis Décamps
f99328b07c minor: remove comment that primaryColor is used for ActionBar
Remove unhelpful comment that primaryColor is used for ActionBar and
that primaryColordark is used for status bar.

Change-Id: Id27c80ecb79852084ffe4d11540d89eac03e9cb5
2014-09-29 18:50:18 +02:00
Martin Hibdon
3c2f782c35 When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
b/17443087
When we migrate exchange accounts, we copy mailboxes over to the
new account (in order to preserve sync frequency and window).
The problem with this is, you may have many accounts/mailboxes.
After starting the app, it may take quite a long time before all
mailboxes are synced. If the user visits some mailbox near the
bottom, they'll see a misleading "folder is empty" view.
Now, when migrating, we'll set the uisyncstatus to INITIAL_SYNC_NEEDED.

Here I needed to add INITAL_SYNC_NEEDED to the list of states
that EmailConversationCursor will consider incompletely loaded.

Change-Id: Idef13adf9d691c03665830a2f926b1806d7591da
2014-09-26 16:02:22 -07:00
Martin Hibdon
d10ae46e60 Merge "Don't allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev 2014-09-25 20:51:46 +00:00
Martin Hibdon
ce6916b32a Don't allow disabling of the camera with managed profiles
Change-Id: I2e6085084682b04ef7973bc433214b5b3ab2da79
2014-09-25 13:48:11 -07:00
Rohan Shah
a64435a62f Update colors in Email (ColorRefactor)
Change-Id: Ie611ccb3af9043fac73d80fa910f91960c6bbbac
2014-09-25 11:45:42 -07:00
Martin Hibdon
809313bda6 Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev 2014-09-24 18:55:19 +00:00
Martin Hibdon
f987ef8f13 Add ability to clear migration state to debug screen
This makes it a lot easier to test migration code.

Change-Id: I22de8c06c34964b8eb7182571094e54f04d739b8
2014-09-24 11:48:46 -07:00
Martin Hibdon
123d40283e Make sure to close a cursor
b/17570154

Change-Id: I759a116a14784e92e7fa7eb51755ceda3860550e
2014-09-24 11:30:52 -07:00
James Lemieux
f1b6b3afd9 Old paper clip asset is removed, which touches a test case here.
Change-Id: Ie070eaeb7d3c4a3663da4cd4761328241ce6467f
2014-09-22 14:00:00 -07:00