Commit Graph

8903 Commits

Author SHA1 Message Date
Baligh Uddin
1a7db4e249 Import translations. DO NOT MERGE
Change-Id: I0d1a4233203a8e68c714f80e1fd708aa1e1159ce
Auto-generated-cl: translation import
2013-09-19 03:57:26 -07:00
Tony Mantler
545eddd37b am 1ced0e30: Merge "Update mailbox status according to current sync status" into jb-ub-mail-ur10
* commit '1ced0e3001dc78e996de49174cb9d2bbbccfec40':
  Update mailbox status according to current sync status
2013-09-18 19:15:03 -07:00
Tony Mantler
8a73860518 am 27de0b24: Merge "Use unified strings for sender image preference and switch to checkbox" into jb-ub-mail-ur10
* commit '27de0b24b241800985b4dfd39995b53aeb6d3658':
  Use unified strings for sender image preference and switch to checkbox
2013-09-18 19:15:02 -07:00
Tony Mantler
1ced0e3001 Merge "Update mailbox status according to current sync status" into jb-ub-mail-ur10 2013-09-19 02:11:46 +00:00
Tony Mantler
27de0b24b2 Merge "Use unified strings for sender image preference and switch to checkbox" into jb-ub-mail-ur10 2013-09-19 02:11:25 +00:00
Tony Mantler
7c8316dc5c am 724b4f9b: Merge "Remove hint text, add contentDescription to the name account page" into jb-ub-mail-ur10
* commit '724b4f9be010f7765e0a0637655be514e185d83a':
  Remove hint text, add contentDescription to the name account page
2013-09-18 19:00:41 -07:00
Tony Mantler
724b4f9be0 Merge "Remove hint text, add contentDescription to the name account page" into jb-ub-mail-ur10 2013-09-19 01:58:29 +00:00
Tony Mantler
04dbb647ff Update mailbox status according to current sync status
b/9177086

Change-Id: I24a7d26b7d7e5ee68ede003e823c1b80abaf56d3
2013-09-18 15:20:59 -07:00
Tony Mantler
acfbeb812b Use unified strings for sender image preference and switch to checkbox
b/10693718

Change-Id: Iec81347915611f81ded0c62ca37c401fdb28ae9f
2013-09-18 14:02:22 -07:00
Tony Mantler
9cf823794e Remove hint text, add contentDescription to the name account page
This matches the tablet version of this screen.

b/10695468

Change-Id: I3b0bfa75cf2e897a16e3493fc4cfc8e74f35e498
2013-09-18 13:32:11 -07:00
Martin Hibdon
b9f1b830ab am ed60a402: Merge "Clear exchange sync keys upon app upgrade" into jb-ub-mail-ur10
* commit 'ed60a4026b55e147ecde5b52af4063c41fe5dcb9':
  Clear exchange sync keys upon app upgrade
2013-09-18 12:12:54 -07:00
Tony Mantler
2c972fad2b am ddb6c2da: Merge "Don\'t disable the back button when the account name fields are invalid" into jb-ub-mail-ur10
* commit 'ddb6c2da8da2493047e84401b5b101e0548379c4':
  Don't disable the back button when the account name fields are invalid
2013-09-18 12:09:44 -07:00
Martin Hibdon
ed60a4026b Merge "Clear exchange sync keys upon app upgrade" into jb-ub-mail-ur10 2013-09-18 19:09:14 +00:00
Tony Mantler
ddb6c2da8d Merge "Don't disable the back button when the account name fields are invalid" into jb-ub-mail-ur10 2013-09-18 19:08:28 +00:00
Tony Mantler
0bfeb90e41 Don't disable the back button when the account name fields are invalid
b/10695553

Change-Id: I32df55594784e24263dede9b767786ccdc83662c
2013-09-18 11:56:47 -07:00
Tony Mantler
2ee7cd55f6 am 75e71b3b: Merge "Don\'t return a null cursor from queries to uimessages" into jb-ub-mail-ur10
* commit '75e71b3b9758b689f5204d5da5eb336a2162d382':
  Don't return a null cursor from queries to uimessages
2013-09-18 11:06:28 -07:00
Tony Mantler
75e71b3b97 Merge "Don't return a null cursor from queries to uimessages" into jb-ub-mail-ur10 2013-09-18 18:03:59 +00:00
Tony Mantler
2c3328bfd7 Don't return a null cursor from queries to uimessages
b/10807214

Change-Id: Ia49dae8bd50773097bb1082c2bc5cf264a76ce55
2013-09-18 10:53:58 -07:00
Tony Mantler
9fad725e8b am 3ba1ed1b: Merge "Fix use-after-null in AccountSetupIncomingFragment" into jb-ub-mail-ur10
* commit '3ba1ed1b88f5c02e3bdebd9c4694a37cdae55f3e':
  Fix use-after-null in AccountSetupIncomingFragment
2013-09-17 20:21:04 -07:00
Tony Mantler
3ba1ed1b88 Merge "Fix use-after-null in AccountSetupIncomingFragment" into jb-ub-mail-ur10 2013-09-18 03:18:57 +00:00
Tony Mantler
9d6a8ab9e8 am 4265ade2: There\'s no such thing as a wrongly incomplete account
* commit '4265ade29a684543ac5b048dda90c4733c58568a':
  There's no such thing as a wrongly incomplete account
2013-09-17 16:55:19 -07:00
Tony Mantler
648a067056 Fix use-after-null in AccountSetupIncomingFragment
b/7967233

Change-Id: I69b7ea521416815fce3bb9e45b38c996b9cea17b
2013-09-17 16:51:52 -07:00
Martin Hibdon
7d6d8c87f8 Clear exchange sync keys upon app upgrade
b/10211620
The problem here is that on app upgrade, we need to change
the types of all email accounts. To do this, we have to
create new accounts and delete the old ones. This resulted
in calendar and contacts data getting deleted.
But we were copying over the last sync keys from the old
account, so on the next sync, we would only get new data.
This means that all of the data that we had gotten on
a previous sync would never be sent again, so calendar
events and contacts would be missing forever.
Now, we just don't migrate the old sync keys. This means
that on the next sync, we'll get all data, and restore
our original state.
This is still not ideal, because it means that any locally
created data that has not yet been synced will be lost
(b/10805685), but it's much better than it was.

Change-Id: I150c4dbdf490a8f3880261e2469795896ebfeab5
2013-09-17 16:43:07 -07:00
Tony Mantler
4265ade29a There's no such thing as a wrongly incomplete account
b/9856118

Change-Id: If2d2c50989285a13eb0ae29961733e472e26c978
2013-09-17 16:03:14 -07:00
Yu Ping Hu
f610ebf926 am e3a4a1b2: Remove dupes before syncing new messages.
* commit 'e3a4a1b25dd20dfd69793ca953f3299bcf6f0501':
  Remove dupes before syncing new messages.
2013-09-17 10:44:38 -07:00
Yu Ping Hu
e3a4a1b25d Remove dupes before syncing new messages.
Bug: 10440557
Change-Id: I4ade38a8bb15cbc22b6c10a5f270274fef6f1fca
2013-09-17 10:02:45 -07:00
Baligh Uddin
00e4950108 am 4953114a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '4953114a154c6fb85ccd88bfb28e393fdd5a87ca':
  Import translations. DO NOT MERGE
2013-09-16 21:22:28 -07:00
Baligh Uddin
21df775862 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-09-17 04:20:16 +00:00
Baligh Uddin
4953114a15 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-09-17 04:20:11 +00:00
Tony Mantler
624b22ae7f am 106970b8: Merge "Notify when message changes (mostly for saving drafts)" into jb-ub-mail-ur10
* commit '106970b83ecc8cfd26e58c2c441f4cd2d64288d4':
  Notify when message changes (mostly for saving drafts)
2013-09-16 18:36:54 -07:00
Tony Mantler
106970b83e Merge "Notify when message changes (mostly for saving drafts)" into jb-ub-mail-ur10 2013-09-17 01:34:06 +00:00
Tony Mantler
c637bff198 Notify when message changes (mostly for saving drafts)
b/10785769

Change-Id: I1ad8e0583ddaa9fa4fcc45906745980f103ec1fa
2013-09-16 16:15:32 -07:00
Yu Ping Hu
0b00fae0d9 am 76bb95b3: Increment Email version.
* commit '76bb95b3631b2e9e7c1d95f2802a610349ee56c3':
  Increment Email version.
2013-09-16 16:14:24 -07:00
Yu Ping Hu
76bb95b363 Increment Email version.
Change-Id: If1b72446258baa0366fdf832d51b41adca21e46e
2013-09-16 16:05:04 -07:00
Yu Ping Hu
4b2e07f56c am d672b0eb: Merge "Fix MessageStateChange to include mailbox id." into jb-ub-mail-ur10
* commit 'd672b0eb2bbba53ecfe2df45b83e3db958a1e31a':
  Fix MessageStateChange to include mailbox id.
2013-09-16 15:58:11 -07:00
Yu Ping Hu
d672b0eb2b Merge "Fix MessageStateChange to include mailbox id." into jb-ub-mail-ur10 2013-09-16 22:56:11 +00:00
Baligh Uddin
37c4501aa7 Import translations. DO NOT MERGE
Change-Id: I0f69705054efbe217ccda0efc694edd3af1ae008
Auto-generated-cl: translation import
2013-09-16 13:26:27 -07:00
Baligh Uddin
aada46812f Import translations. DO NOT MERGE
Change-Id: I0a5bd57962e52d8a407db1282a491913ccbcfd9d
Auto-generated-cl: translation import
2013-09-16 13:25:25 -07:00
Martin Hibdon
f1820e3bfa am 26ee7c98: Merge "Make sync settings less confusing." into jb-ub-mail-ur10
* commit '26ee7c98759a0cc090009259c8de60ecb8e29e94':
  Make sync settings less confusing.
2013-09-16 12:31:24 -07:00
Martin Hibdon
26ee7c9875 Merge "Make sync settings less confusing." into jb-ub-mail-ur10 2013-09-16 19:28:32 +00:00
Tony Mantler
fad2981702 am 1cede711: Merge "Fix "Load More" for IMAP search" into jb-ub-mail-ur10
* commit '1cede711941eb32970a0c270dc7fb31b3f28f8f1':
  Fix "Load More" for IMAP search
2013-09-16 12:19:15 -07:00
Tony Mantler
1cede71194 Merge "Fix "Load More" for IMAP search" into jb-ub-mail-ur10 2013-09-16 19:18:02 +00:00
Martin Hibdon
0e550e0857 Make sync settings less confusing.
b/10602459
It was possible to turn off syncing for an account in global
settings, but we'd continue displaying some sync frequency
in the in-app settings.
Now, we only display the sync frequency if sync is actually
enabled. If it's disabled we always display "never". Also,
when the user changes a sync setting, if it's set to "never",
we leave the frequency in the database as it is, but disable
sync for that account. If it's set to anything else, we store
that in the database and ensure that sync for the account is
enabled. This means we should not have any apparent disagreement
between in-app settings and global settings as to whether or
not syncing will happen.

Change-Id: I1cc54e76aafd25dc4db0f1b713e7d7cbc30bf77f
2013-09-16 11:57:35 -07:00
Tony Mantler
7d761f3de3 Fix "Load More" for IMAP search
Also kill some warnings while I'm at it.

b/8607507

Change-Id: I8bfa90e9144d71e964799d6f2dab5e79f48b277f
2013-09-16 11:56:11 -07:00
Yu Ping Hu
e984940465 Fix MessageStateChange to include mailbox id.
Also ignore messages without server ids for moves and
state changes.

Also cleanup to match needs of EAS upsync.

Bug: 10678136
Change-Id: Id4d5229b8479e61bd718b707b0d2bc77a9e68046
2013-09-15 15:43:35 -07:00
Yu Ping Hu
cf1d16c2a1 am ed610f74: Merge "Only set sync mailbox to inbox if none was specified." into jb-ub-mail-ur10
* commit 'ed610f749c317dd6bc9c970fa56fb8c8cf585842':
  Only set sync mailbox to inbox if none was specified.
2013-09-14 19:56:29 -07:00
Yu Ping Hu
ed610f749c Merge "Only set sync mailbox to inbox if none was specified." into jb-ub-mail-ur10 2013-09-15 02:55:04 +00:00
Baligh Uddin
ea07224e44 am 7caf0437: (-s ours) Import translations. DO NOT MERGE
* commit '7caf043787a707f9c13a9ed20a794a16422cb4b4':
  Import translations. DO NOT MERGE
2013-09-14 13:51:12 -07:00
Baligh Uddin
54c12473c2 Import translations. DO NOT MERGE
Change-Id: Ia50b21ed8bf98f158975cb1605a93bae08eae16f
Auto-generated-cl: translation import
2013-09-14 01:13:54 -07:00
Baligh Uddin
7caf043787 Import translations. DO NOT MERGE
Change-Id: I3cef9eea5e6cad55387774e7508e1749fa0228af
Auto-generated-cl: translation import
2013-09-14 01:12:53 -07:00