Paul Westbrook
703f2a7ee1
am 908fac0b
: Fix NPE
...
* commit '908fac0b247deff27fee44297f892afdfbb086a5':
Fix NPE
2013-08-16 16:13:26 -07:00
Paul Westbrook
908fac0b24
Fix NPE
...
Bug: 10292690
Change-Id: I34714a6a07bcaba3d20fdae32ee6b129c74c8a32
2013-08-16 15:53:36 -07:00
Tony Mantler
f36791eefd
am dae31e6c
: Merge "Reimplement QuickResponse support" into jb-ub-mail-ur10
...
* commit 'dae31e6c28c2380a680f6fdbff416e4fa31488b2':
Reimplement QuickResponse support
2013-08-16 14:58:55 -07:00
Tony Mantler
dae31e6c28
Merge "Reimplement QuickResponse support" into jb-ub-mail-ur10
2013-08-16 21:57:33 +00:00
Martin Hibdon
d20f163913
am 1a0aa22d
: Cut down on some unneccesary allocations
...
* commit '1a0aa22dc02fdfc6876ee90926acc447da8fe935':
Cut down on some unneccesary allocations
2013-08-16 14:41:28 -07:00
Martin Hibdon
1a0aa22dc0
Cut down on some unneccesary allocations
...
We were always allocating a one element array in
a loop. We can just keep create one array and
reuse it.
Change-Id: Ia44f0b711ef48fb87030c3f09f3f9fb654717b7a
2013-08-16 14:19:07 -07:00
Tony Mantler
c6953b7755
Reimplement QuickResponse support
...
b/8622751
Change-Id: Id079efcf34dce15b5f5057f937582c0e198d3d50
2013-08-16 14:08:54 -07:00
Paul Westbrook
076c892e80
am 2127d4dd
: Use name "Email" instead of Email2
...
* commit '2127d4dd096408ae3a31278f90b2d90c17a41d97':
Use name "Email" instead of Email2
2013-08-16 10:10:30 -07:00
Paul Westbrook
2127d4dd09
Use name "Email" instead of Email2
...
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/344210/1
Change-Id: I67e8f1b46e708b65934c794f7df107138f84c7c9
2013-08-16 09:22:57 -07:00
Baligh Uddin
a5879b621f
am 62630e8d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '62630e8d6c38d4506385d3efce19f3fc3ec640c9':
Import translations. DO NOT MERGE
2013-08-15 17:54:32 -07:00
Martin Hibdon
4622112c88
am 8708594f
: Use insecure socketFactory if "accept all certificates"
...
* commit '8708594f03068a8c71a6c6e752b52c2fc1a733d8':
Use insecure socketFactory if "accept all certificates"
2013-08-15 17:54:31 -07:00
Baligh Uddin
576914eaeb
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-08-16 00:53:10 +00:00
Baligh Uddin
62630e8d6c
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-08-16 00:53:08 +00:00
Martin Hibdon
8708594f03
Use insecure socketFactory if "accept all certificates"
...
b/9176386
Change-Id: I1edc92bb4207d166e9b252bf3ed98ad8b2c4d996
2013-08-15 17:45:36 -07:00
Yu Ping Hu
00c032df03
am 64fa58a0
: Increment Email version.
...
* commit '64fa58a0bce3518759a0355ebeb2466258d2cb7a':
Increment Email version.
2013-08-15 17:44:20 -07:00
Yu Ping Hu
64fa58a0bc
Increment Email version.
...
Change-Id: I40c58ab66a6838e15e9abdd629e05de526597ba6
2013-08-16 00:32:10 +00:00
Baligh Uddin
57a2e2b1b6
Import translations. DO NOT MERGE
...
Change-Id: I01f66240572840879243e0aff167956cd346a4a9
Auto-generated-cl: translation import
2013-08-14 15:47:35 -07:00
Baligh Uddin
444eccf0cc
Import translations. DO NOT MERGE
...
Change-Id: Icdaa563ba4b2ead825c5f670f069e8d2103957b6
Auto-generated-cl: translation import
2013-08-14 15:46:50 -07:00
Tony Mantler
5dcf6e7f15
am 72632593
: android:layout_alignParentTop is not a property in LinearLayout
...
* commit '72632593cde9b012c186a539fe724f10aa60e011':
android:layout_alignParentTop is not a property in LinearLayout
2013-08-14 13:30:35 -07:00
Tony Mantler
72632593cd
android:layout_alignParentTop is not a property in LinearLayout
...
Change-Id: I2c3debd331ee2074ff6432a4f5a680ade8c6ef6d
2013-08-14 13:25:22 -07:00
Yu Ping Hu
de312eb06b
am 859a4ef1
: Merge "Don\'t crash when the policy service is unavailable." into jb-ub-mail-ur10
...
* commit '859a4ef1e9357e196f4b9caa92e4bf36c398d33d':
Don't crash when the policy service is unavailable.
2013-08-14 10:58:15 -07:00
Yu Ping Hu
859a4ef1e9
Merge "Don't crash when the policy service is unavailable." into jb-ub-mail-ur10
2013-08-14 17:56:08 +00:00
Yu Ping Hu
eb190a8d9d
Don't crash when the policy service is unavailable.
...
This isn't a great situation -- it suggests the PolicyService
is having some sort of RemoteException -- but when it happens
we should just treat it the same as if the policy is not
enforced.
Bug: 10315113
Change-Id: If2fbe1648a5c6f3df13cef02c8dc5bc6e858f2d9
2013-08-14 10:46:07 -07:00
Paul Westbrook
7c35c519b2
am 7985b43a
: Add public no-arg Fragment constructors
...
* commit '7985b43ab7310f76c170266da346f993d2f86051':
Add public no-arg Fragment constructors
2013-08-13 21:54:42 -07:00
Paul Westbrook
7985b43ab7
Add public no-arg Fragment constructors
...
Bug: 10311630
Change-Id: I0243462cdc28b9af3151754a8c8583330418579b
2013-08-13 16:43:34 -07:00
Martin Hibdon
b2947f4702
am 66ac290b
: Fix a bug causing duplicate messages to be added
...
* commit '66ac290b353302256e85d319c0ce623277dfdad3':
Fix a bug causing duplicate messages to be added
2013-08-12 18:44:56 -07:00
Martin Hibdon
66ac290b35
Fix a bug causing duplicate messages to be added
...
The IMAP time based query only takes a date, not a
date/time. This means that if we want to load all
messages since, for example, Aug 11 at 3:00 PM,
we'll actually get all messages since Aug 11 at any time.
Our local query actually took into account the time, so
when we loaded a map of local messages, it would not
always include all of the same messages that the IMAP
query would. This meant that if we processed a message
that was in our IMAP query window but not our local query
window, we'd always think it was a new message even
if it wasn't.
It's easy enough to increase the size of our local query
window so that it will definitely include all of the
messages the IMAP query might return, but this adds
a new problem: It's no longer safe to delete any local
message that did not come back in our IMAP query result.
Since our local query may include a larger time window
than the IMAP query window, we need to check each message's
timestamp, and only delete it if it is inside the remote
query time window.
Change-Id: Ib3c1bbe8f3db05720d32a981483676afa6d6c38b
2013-08-12 17:22:24 -07:00
Tony Mantler
df5332e174
am cef6c19b
: Move the "Add new quick response" button into the action bar
...
* commit 'cef6c19be22fb026161a7763f4e1efb1e30a728a':
Move the "Add new quick response" button into the action bar
2013-08-12 13:25:29 -07:00
Tony Mantler
cef6c19be2
Move the "Add new quick response" button into the action bar
...
Change-Id: I433fb686837d0de125fb277f5055bc33b7769eff
2013-08-12 12:04:43 -07:00
Paul Westbrook
3cbefa3e60
am 8c13dcd9
: Merge "Fix problem in IMAP with non-roman locales" into jb-ub-mail-ur10
...
* commit '8c13dcd950b2a5d5a95d60690e2d3bd42b4ffbdf':
Fix problem in IMAP with non-roman locales
2013-08-12 12:04:10 -07:00
Paul Westbrook
8c13dcd950
Merge "Fix problem in IMAP with non-roman locales" into jb-ub-mail-ur10
2013-08-12 19:02:39 +00:00
Tony Mantler
cb17f65690
am 948e503b
: Merge "Continue rewriting QuickResponse support" into jb-ub-mail-ur10
...
* commit '948e503b4a2e1b2a74e3919bb64dc7df7dc91b33':
Continue rewriting QuickResponse support
2013-08-12 11:44:55 -07:00
Paul Westbrook
ae29fb76f0
Fix problem in IMAP with non-roman locales
...
This is a partial cherry-pick of:
https://android-review.googlesource.com/#/c/57514/1
Change-Id: I1dea4d5bf0bd02fec2baf5763f5864c3eb32f744
2013-08-12 11:43:44 -07:00
Tony Mantler
948e503b4a
Merge "Continue rewriting QuickResponse support" into jb-ub-mail-ur10
2013-08-12 18:42:49 +00:00
Tony Mantler
6d24534804
Continue rewriting QuickResponse support
...
Change-Id: I95530e84d91f4becb3de5280af83ce546e1ed093
2013-08-12 11:40:16 -07:00
Alice Yang
20fb031633
am 50f0cba9
: Merge "Sync disabled tip" into jb-ub-mail-ur10
...
* commit '50f0cba92ce2c2f45600cfd0e5184df84d3ab370':
Sync disabled tip
2013-08-11 22:43:29 -07:00
Alice Yang
50f0cba92c
Merge "Sync disabled tip" into jb-ub-mail-ur10
2013-08-12 05:38:59 +00:00
Yu Ping Hu
285e57c7a2
am 2bafe9d9
: Add a utility function to map mailbox type to authority.
...
* commit '2bafe9d90497f48aaf4009d8428f30bbe97e89ba':
Add a utility function to map mailbox type to authority.
2013-08-09 17:59:09 -07:00
Yu Ping Hu
2bafe9d904
Add a utility function to map mailbox type to authority.
...
Change-Id: I21731a5d9ba45850577fdda4d6bef8835d6d3249
2013-08-09 17:30:32 -07:00
Paul Westbrook
9cf070e767
am e13af80f
: Merge "Updated account access settings for Wirtualna Polska" into jb-ub-mail-ur10
...
* commit 'e13af80f6f0652fca36058313243483df138e4eb':
Updated account access settings for Wirtualna Polska
2013-08-09 13:44:09 -07:00
Yu Ping Hu
9a996057a5
am 4ef1f6a6
: Merge "Synchronize all access to the EmailServiceInfo map." into jb-ub-mail-ur10
...
* commit '4ef1f6a689e12f265d12638329a35c9ae927b3b8':
Synchronize all access to the EmailServiceInfo map.
2013-08-09 13:44:08 -07:00
Paul Westbrook
e13af80f6f
Merge "Updated account access settings for Wirtualna Polska" into jb-ub-mail-ur10
2013-08-09 20:42:21 +00:00
Yu Ping Hu
4ef1f6a689
Merge "Synchronize all access to the EmailServiceInfo map." into jb-ub-mail-ur10
2013-08-09 20:41:47 +00:00
Tomasz Potega
7f4bc353fa
Updated account access settings for Wirtualna Polska
...
See:
http://poczta.wp.pl/info-pomoc-konfig.html?action=more&id=161
SSL encryption on by default, IMAP access.
Change-Id: I60d4f264a50e8f2c501493c64ef5e631a690073b
Signed-off-by: Tomasz Potega <tomasz.potega@gmail.com>
2013-08-09 13:33:09 -07:00
Paul Westbrook
f710d4a0bf
am 3b758913
: Merge "Use DatabaseUtils method instead of query()" into jb-ub-mail-ur10
...
* commit '3b758913be54c4d561ce718cb2cd629686f92037':
Use DatabaseUtils method instead of query()
2013-08-09 12:21:50 -07:00
Paul Westbrook
3b758913be
Merge "Use DatabaseUtils method instead of query()" into jb-ub-mail-ur10
2013-08-09 19:19:44 +00:00
yi.jang
809b52b117
am 44e16031
: Use deleteDatabase method to improve safety of DB file handling
...
* commit '44e16031550929a5e840aa61dcb4246ff1f691d9':
Use deleteDatabase method to improve safety of DB file handling
2013-08-09 12:05:39 -07:00
yi.jang
44e1603155
Use deleteDatabase method to improve safety of DB file handling
...
Deleting .db files can make malformed database issues
when WAL(write ahead logging) mode is enabled.
EmailProvider doesn't use WAL mode currently,
But it has to be fixed because it might cause the problem in the
future.
Change-Id: Ie0313c5d253f3080401b00b197e7cbf97f25423c
Conflicts:
src/com/android/email/provider/EmailProvider.java
2013-08-09 11:58:15 -07:00
Yu Ping Hu
b5eed31d1b
Synchronize all access to the EmailServiceInfo map.
...
Bug: 10255995
Change-Id: I36bee575a923b5c8bfbaea7babdf9f2c5e9bd378
2013-08-09 11:51:53 -07:00
yi.jang
a674551464
Use DatabaseUtils method instead of query()
...
Use DatabaseUtils.longForQuery() method instead of SQLiteDatabase.query().
This reduces processing cost of database cursor.
Change-Id: Ibe53645b32a4de1ab6518f879e564ddf8f75d822
Conflicts:
src/com/android/email/provider/EmailProvider.java
2013-08-09 11:50:27 -07:00