Commit Graph

9565 Commits

Author SHA1 Message Date
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
Yu Ping Hu
c48670a569 Only set sync mailbox to inbox if none was specified.
Follow up to I9e62d5de10222f1d81b47a68dd0b3ab05de5436d.

Bug: 10729228
Change-Id: I8100a0a5d965e4c4c86dccb6c94dfe26cc6e49a0
2013-09-13 17:54:50 -07:00
Tony Mantler
bf3672bcd2 am e85736a1: Merge "Disable RTL support" into jb-ub-mail-ur10
* commit 'e85736a174e55311ff67bcbbc3dceb40de30f50c':
  Disable RTL support
2013-09-13 16:22:04 -07:00
Tony Mantler
572f7c1b9c am 99e3ee7c: Add mail.ru to providers.xml
* commit '99e3ee7c970c9b479b20f727e9e0f1228113e701':
  Add mail.ru to providers.xml
2013-09-13 16:22:03 -07:00
Tony Mantler
e85736a174 Merge "Disable RTL support" into jb-ub-mail-ur10 2013-09-13 23:20:54 +00:00
Martin Hibdon
4a56a5ba34 am 1a7838ee: Update folder structure on every POP or IMAP sync
* commit '1a7838eed7558a8f5caa23128518cae09d8a034f':
  Update folder structure on every POP or IMAP sync
2013-09-13 15:50:45 -07:00
Alice Yang
c3912fcaa3 am 17d014df: Disable attachment previews
* commit '17d014dfdf172f3b60bcdb41f1b831fbdc8230d4':
  Disable attachment previews
2013-09-13 15:35:26 -07:00
Tony Mantler
99e3ee7c97 Add mail.ru to providers.xml
b/9862569

Change-Id: If95d0c4a4f0173dba5c7739a038db96e9f671af3
2013-09-13 15:06:59 -07:00
Martin Hibdon
1a7838eed7 Update folder structure on every POP or IMAP sync
b/10729228

Change-Id: I9e62d5de10222f1d81b47a68dd0b3ab05de5436d
2013-09-13 13:42:42 -07:00
Tony Mantler
1a903dbdcf Disable RTL support
b/10609607

Change-Id: Id4b1cb8370f550d9bc43e966e2d576c9257197ee
2013-09-13 13:31:12 -07:00
Alice Yang
17d014dfdf Disable attachment previews
Change-Id: Ic2314f89b813956a6351bed51bfa6881e51605ff
2013-09-13 00:43:55 -07:00
Martin Hibdon
5c2455149f am 24bb2dab: Kill the process when an account is deleted.
* commit '24bb2dabd9dd7d8bd39fed53f312ae6034e373bb':
  Kill the process when an account is deleted.
2013-09-12 18:31:38 -07:00
Martin Hibdon
24bb2dabd9 Kill the process when an account is deleted.
b/10653370
This prevents NPEs if a serviec happens to still be running
when an account is deleted.
This mirrors a similar pattern in the gmail app.

Change-Id: I6fd8ae5ffe41580df0a321ec22535403e3f32eee
2013-09-12 18:21:18 -07:00
Martin Hibdon
54e2998b7d am 64690e94: Merge "Delete POP emails when they are removed from the server" into jb-ub-mail-ur10
* commit '64690e9452b4d5c803457c95065b9481c28c48b5':
  Delete POP emails when they are removed from the server
2013-09-12 14:56:52 -07:00
Martin Hibdon
64690e9452 Merge "Delete POP emails when they are removed from the server" into jb-ub-mail-ur10 2013-09-12 21:55:19 +00:00
Martin Hibdon
e25e6b2937 Delete POP emails when they are removed from the server
b/10461973

Change-Id: Iccd455b4b71d83318c7f5429f399fe5db2558e42
2013-09-12 14:38:55 -07:00
Tony Mantler
ee0f5ca683 am da42d856: Don\'t skip attachment saving if the attachment is not yet saved.
* commit 'da42d856b8940f58c0431dd2f0fb7e8c8f8c0644':
  Don't skip attachment saving if the attachment is not yet saved.
2013-09-12 11:52:14 -07:00
Tony Mantler
da42d856b8 Don't skip attachment saving if the attachment is not yet saved.
Also tidy up warnings

b/10461356

Change-Id: I65ac4c5b512cd67a39c81606391a2b044213f269
2013-09-12 11:04:49 -07:00
Tony Mantler
4acdcae3a4 am 4f63f1ee: Merge "Purge views after they\'re supposed to be destroyed to avoid spurious callbacks" into jb-ub-mail-ur10
* commit '4f63f1eec1138cc650ff4f6bda9ba8faa62ef6c2':
  Purge views after they're supposed to be destroyed to avoid spurious callbacks
2013-09-12 09:30:36 -07:00
Tony Mantler
4f63f1eec1 Merge "Purge views after they're supposed to be destroyed to avoid spurious callbacks" into jb-ub-mail-ur10 2013-09-12 16:28:07 +00:00
Baligh Uddin
dc9108cc22 am fd9ec82b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit 'fd9ec82bb8a3cce0f9fdf3955b6af2ea1825f852':
  Import translations. DO NOT MERGE
2013-09-12 09:11:25 -07:00
Baligh Uddin
51128018aa Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-09-12 03:39:16 +00:00
Baligh Uddin
fd9ec82bb8 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-09-12 03:39:11 +00:00
Martin Hibdon
091a37dd24 am 92e13548: Merge "Fix a bug in Pop3 sync" into jb-ub-mail-ur10
* commit '92e13548edbe750515df8cbf1d49d285eaedf74a':
  Fix a bug in Pop3 sync
2013-09-11 17:51:54 -07:00
Martin Hibdon
92e13548ed Merge "Fix a bug in Pop3 sync" into jb-ub-mail-ur10 2013-09-12 00:49:58 +00:00
Martin Hibdon
85ff07a00a Fix a bug in Pop3 sync
b/10413188
There are still several issues with attachments generally,
but this fixes the most glaring problem: We were short circuiting
in a loop that needed to populate a hash table of remote message
Ids, so not all of them would be present. The later code intended
to load attachments expected it to be fully populated.
There are still several problems, notably that if downloading
doesn't work, it just spins forever, but this fixes the first
problem.

Change-Id: I2b23dcb841edabe108096933fea2350ef61a10f1
2013-09-11 17:19:00 -07:00
Tony Mantler
ecac654c66 Purge views after they're supposed to be destroyed to avoid spurious callbacks
b/10565885

Change-Id: I7ef18fdac566975d15ffd1a19f756a5e5d2aee8a
2013-09-11 16:47:47 -07:00
Baligh Uddin
be9c6a0a5c Import translations. DO NOT MERGE
Change-Id: Ibecf7c0b92ce06e58572bef541a586fb82581e86
Auto-generated-cl: translation import
2013-09-11 16:45:34 -07:00
Baligh Uddin
eb659e88b5 Import translations. DO NOT MERGE
Change-Id: Ic5f79dff6a32c34eb81753f51ab4dc32514ed6cc
Auto-generated-cl: translation import
2013-09-11 16:44:24 -07:00
Tony Mantler
7ef1d5c85a am 78c166b4: Disallow duplicate accounts
* commit '78c166b4ccbd4342a07e32571f09fddbb56138b2':
  Disallow duplicate accounts
2013-09-11 15:29:14 -07:00
Tony Mantler
463ed11857 Disable account setup debug screen.
b/10446166

Change-Id: I6703c1950559e9896f168a0cbaec10040eac9589
2013-09-11 15:17:42 -07:00
Tony Mantler
78c166b4cc Disallow duplicate accounts
b/10210901

Change-Id: I11b759246fafabafe29fd8f4d20f6e973f9679a4
2013-09-11 15:15:38 -07:00
Tony Mantler
993136a9b7 am 9ae3ae57: Merge "Remove subtitle from "Confirm before X" preferences" into jb-ub-mail-ur10
* commit '9ae3ae576ab14888e2554a0f1674b8a756d64ea4':
  Remove subtitle from "Confirm before X" preferences
2013-09-11 13:27:49 -07:00
Tony Mantler
7dd1f24361 am de8b97c7: Postpone initialization of notification URIs until the EMAIL_PACKAGE_NAME is known
* commit 'de8b97c72e8d0019d892f70d3d452ada051ed8f3':
  Postpone initialization of notification URIs until the EMAIL_PACKAGE_NAME is known
2013-09-11 13:27:49 -07:00
Tony Mantler
9ae3ae576a Merge "Remove subtitle from "Confirm before X" preferences" into jb-ub-mail-ur10 2013-09-11 20:27:18 +00:00
Tony Mantler
08b2a505d0 Remove subtitle from "Confirm before X" preferences
b/10696931

Change-Id: I6353f045322d49c26b69d7e96357ec7a8ef426f8
2013-09-11 13:25:56 -07:00
Tony Mantler
de8b97c72e Postpone initialization of notification URIs until the EMAIL_PACKAGE_NAME is known
b/10693908

Change-Id: Ia232dda55e03e02db24040b9d17c383addaff0b0
2013-09-11 11:48:38 -07:00
Tony Mantler
66857db7c6 am 2bae64df: Merge "Notify combined account when individual accounts change" into jb-ub-mail-ur10
* commit '2bae64df29c592928c380813cca0b4cac28804a4':
  Notify combined account when individual accounts change
2013-09-11 09:24:00 -07:00
Tony Mantler
54a185c5de am 9a1d9a7d: Merge "Reorder db update/notify and clean up warnings in EmailProvider" into jb-ub-mail-ur10
* commit '9a1d9a7dbb45f55627c15e83878821c3d20179d3':
  Reorder db update/notify and clean up warnings in EmailProvider
2013-09-11 09:23:59 -07:00
Tony Mantler
2bae64df29 Merge "Notify combined account when individual accounts change" into jb-ub-mail-ur10 2013-09-11 16:21:34 +00:00