Commit Graph

4880 Commits

Author SHA1 Message Date
Eric Fischer
bd5557458f am c0d3a8fe: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1
* commit 'c0d3a8fedbfd515eeec14a582396ec8cce5d373c':
  Remove unneeded large-screen-specific translations.
2011-03-04 01:09:01 -08:00
Makoto Onuki
72072ceab0 am ab8caebe: (-s ours) Merge "DO NOT MERGE: Fix ANR: Run getPreviewIcon on bg thread" into honeycomb-mr1
* commit 'ab8caebec6e6b4398a02abe6cb1305c424bea734':
  DO NOT MERGE: Fix ANR: Run getPreviewIcon on bg thread
2011-03-04 01:08:59 -08:00
Todd Kennedy
b656f9f885 am d8bce7e7: (-s ours) DO NOT MERGE Add original HTML message to forward/reply
* commit 'd8bce7e73155dca734f45502e52c0039de4c9663':
  DO NOT MERGE Add original HTML message to forward/reply
2011-03-04 01:08:56 -08:00
Eric Fischer
5edf3e7dbe am ded1c275: (-s ours) Import revised translations. DO NOT MERGE
* commit 'ded1c27515d77e34a8f9510f97689551ad777b19':
  Import revised translations.  DO NOT MERGE
2011-03-03 18:19:35 -08:00
Marc Blank
a6de89e79c Harden Device.getDeviceId()
* If we read a null deviceName, delete the file and create a
  new one.

Bug: 3506362
Change-Id: Ida670db2f4b75cb9c94636a0af541ae5df50addf
2011-03-03 16:54:39 -08:00
Marc Blank
b812cc7298 Merge "Add account flag for use by sync adapters" 2011-03-03 16:48:46 -08:00
Marc Blank
0dd02cc1f0 Add account flag for use by sync adapters
Change-Id: Idc4bd74877b4edee9dab5401c4825eab82220f23
2011-03-03 16:10:33 -08:00
Eric Fischer
c0d3a8fedb Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 2011-03-03 16:04:01 -08:00
Eric Fischer
a0fdcee93c Remove unneeded large-screen-specific translations.
Change-Id: I3e384c0b6ceba3e0620e6002c38c665b990c737d
2011-03-03 15:49:31 -08:00
Makoto Onuki
ab8caebec6 Merge "DO NOT MERGE: Fix ANR: Run getPreviewIcon on bg thread" into honeycomb-mr1 2011-03-03 15:31:13 -08:00
Todd Kennedy
d8bce7e731 DO NOT MERGE Add original HTML message to forward/reply
When replying or fowarding an HTML message, we now send both plain text and
HTML bodies as a multi-part mime message. We take special care to ensure the
message bodies are in their own multi-part block and do not interfere with
any additional attachments to the message.

bug 3060920

Backport-Of: I2fc3cb4e1f65bcc28486a62731b44b0ee0a99719

Change-Id: I89ec2795b55ceb7472a8ee3db2dc8f50cf537d9c
2011-03-03 15:27:09 -08:00
Todd Kennedy
7d513c791a Merge "Attach original HTML message on forward/reply" 2011-03-03 15:25:50 -08:00
Makoto Onuki
ef2bc0b3e9 DO NOT MERGE: Fix ANR: Run getPreviewIcon on bg thread
The new class EmailAsyncTask might look overkill, but
this is what I've been wanting for long time.
In many activities we store all AsyncTasks we start to member fields
so that we can cancel them in onDestroy().  (e.g.
MessageViewFragmentBase.mLoadMessageTask and mReloadMessageTask)
With EmailAsyncTask these fields will no longer be necessary.
We'll be able to just fire up as many AsyncTasks as we want, and clean them
up in onDestroy() with just cancellAllInterrupt().

Bug 3480136

Backport of Id8aa1ba1500eee58cfab8b562b95e9ed852b3e29

Change-Id: I2d2966ff878862a5246c031d1d4e221da5a7e81a
2011-03-03 14:55:54 -08:00
Makoto Onuki
ba125ab5ac Fix ANR: Run getPreviewIcon on bg thread
The new class EmailAsyncTask might look overkill, but
this is what I've been wanting for long time.
In many activities we store all AsyncTasks we start to member fields
so that we can cancel them in onDestroy().  (e.g.
MessageViewFragmentBase.mLoadMessageTask and mReloadMessageTask)
With EmailAsyncTask these fields will no longer be necessary.
We'll be able to just fire up as many AsyncTasks as we want, and clean them
up in onDestroy() with just cancellAllInterrupt().

Bug 3480136

Change-Id: Id8aa1ba1500eee58cfab8b562b95e9ed852b3e29
2011-03-03 14:43:07 -08:00
Todd Kennedy
9cc51b72c6 Attach original HTML message on forward/reply
When replying or fowarding an HTML message, we now send both plain text and
HTML bodies as a multi-part mime message. We take special care to ensure the
message bodies are in their own multi-part block and do not interfere with
any additional attachments to the message.

bug 3060920

Change-Id: I2fc3cb4e1f65bcc28486a62731b44b0ee0a99719
2011-03-03 14:37:03 -08:00
Eric Fischer
ded1c27515 Import revised translations. DO NOT MERGE
Change-Id: I33c67829f28644e0eaf1ed6212e3e17d9d02fed5
2011-03-03 14:08:52 -08:00
Andy Stadler
45e161bb5e Merge "Enable SD card encryption policy when emulated" 2011-03-02 20:45:53 -08:00
Makoto Onuki
ace01c0fb1 Merge "Compose: Fix bug where attachments can't be removed" 2011-03-02 17:53:56 -08:00
Andy Stadler
7fd14be804 Enable SD card encryption policy when emulated
* This is is a minimal implementation that only supports the external
  encryption policy when there is no physical/removable storage, and
  the emulated external storage is located within an encrypted backing
  store.

Bug: 3351426
Change-Id: Id96e9277f810beeebf816a914acd3d733eb713ea
2011-03-02 16:41:19 -08:00
Andy Stadler
dcbf2be046 Merge "Don't send ID command to *.secureserver.net" 2011-03-02 16:34:30 -08:00
Andy Stadler
45d50a1ccf Don't send ID command to *.secureserver.net
Fixes connection failures with GoDaddy IMAP.

Bug: 3497713
Change-Id: I327d9b24598d7dead2d1b74f4e37d1e5885822a6
2011-03-02 16:13:23 -08:00
Marc Blank
4ef0960790 Merge "Add some Mailbox flags for use in folder management" 2011-03-02 16:11:38 -08:00
Marc Blank
fdf4a94094 Add some Mailbox flags for use in folder management
* These flags are documented in place
* Also add constants for sentinel values of PARENT_KEY

Change-Id: I0403a196599fa938528d874dc56d56522a573d56
2011-03-02 16:11:12 -08:00
Makoto Onuki
a54d8bb4ee Compose: Fix bug where attachments can't be removed
If the account supports smart-forward.  The old code assumed
attachments are not removable if the account supports smart-forward,
which is not true.  Locally-added attachments should still be removable.

Bug 3505684

Change-Id: Ie6703551800c617dd224957a098311f0c279b3f1
2011-03-02 15:45:36 -08:00
Makoto Onuki
daf48b5c2e Merge "Fix ANR/crash when you open & close a large EML" 2011-03-02 15:18:45 -08:00
Makoto Onuki
ee82e34a28 Fix ANR/crash when you open & close a large EML
The problem was:
- MessageFileViewFragment.clearContent (A) is called in onDestroy
- MessageFileViewFragment.openMessageSync (B) is called in a bg thread
  to load an eml file
- And both try to hold the same lock. (mLock)
- If EML is large enough, B takes _seconds_.  If you press back during this,
  onDestroy gets blocked trying to lock mLock.
- This could also cause a crash, because the task that runs openMessageSync
  won't get cancelled in this case, because that's done in clearContent.
  Because of this, the task's onPostExecute tries to touch a UI element
  when the fragment is actually being destroyed.

The lock was introduced to protect mFileEmailUri, only to keep the same
semantics for openMessage() as MessageViewFragment. i.e. openMessage can be
called multiple times for the same instance of the fragment.

However, in practice, this won't happen.  Unlike the regular message view,
we never reuse MessageFileViewFragment.  MessageFileViewFragment instances
are created per message.  This lock was just reminiscence from the early
developmen stage.

So, fix is simple -- just remove the lock.

Bug 3500487

Change-Id: If2b22a683666de535454bb1293563796fa7acfd7
2011-03-02 13:38:34 -08:00
Eric Fischer
b208fa6e60 am 55b3ef44: (-s ours) am 5c284dae: Import revised translations. DO NOT MERGE
* commit '55b3ef44ea5c8217a6b2deb19df8024b92199ad0':
  Import revised translations.  DO NOT MERGE
2011-03-02 12:54:05 -08:00
Makoto Onuki
19b2a7ebc9 New debug setting to enable strict mode logging.
For now it only enables it for the main process.  I've added a flag
to EmailServiceProxy for EAS, but it's not used in the exchange side.

Bug 3500292

Change-Id: I5b27c69fe7cc995a430e9def54b2463076032c78
2011-03-02 10:41:48 -08:00
Marc Blank
833bf485a8 Merge "Fix typo and comment" 2011-03-02 09:37:27 -08:00
Marc Blank
25ab2df296 Fix typo and comment
Change-Id: Iffc69baf98c05a09693ba9a053c91d921fc1b423
2011-03-02 09:37:00 -08:00
Andy Stadler
2d6a98aedf Prevent NPE when account sender name is null
Bug: 3500373
Change-Id: Id07270f34d9cc0523c46104b3167711b71798623
2011-03-01 22:19:53 -08:00
Ying Wang
37f3385803 Split out emailcommon/Android.mk
Change-Id: I846ee2a4b541f4709e647aa537c61549db2bec2e
2011-03-01 15:56:27 -08:00
Andy Stadler
5297b452a2 Repair build break caused by gerrit non-rebase bug
* Undo the combination of I90653e86 & Ia07f2ae0
* By re-inserting the changes from I79d48bef

Change-Id: I70ac46c91f1ab5c90b74b0d43f293fb9741206cd
2011-03-01 15:29:45 -08:00
Ying Wang
a07f2ae0b1 Revert "Split out emailcommon/Android.mk"
This reverts commit c28bf35319.
2011-03-01 14:52:05 -08:00
Todd Kennedy
7c87bfc33a Change "appendQuotedText" to "useSmartReply" in Rfc822Output
Slight API change to make it more clear what the method parameter is for.
Also add some additonal test conditions to the Rfc822Output tests.

Reapply changes in CL https://android-git.corp.google.com/g/#change,99090

Change-Id: I7a48c9544e48cbdf44b14f4b1f8d92fe01f7861e
2011-03-01 14:46:38 -08:00
Eric Fischer
55b3ef44ea am 5c284dae: Import revised translations. DO NOT MERGE
* commit '5c284daed9df6c2e0e9964997c748d5e5f986897':
  Import revised translations.  DO NOT MERGE
2011-03-01 14:41:46 -08:00
Ying Wang
39919cb5e0 Merge "Split out emailcommon/Android.mk" 2011-03-01 14:28:14 -08:00
Eric Fischer
5c284daed9 Import revised translations. DO NOT MERGE
Change-Id: Ic8a4577ea47e6273253193290393351436440517
2011-03-01 14:25:00 -08:00
Todd Kennedy
9ad3799fe4 Merge "Change "appendQuotedText" to "useSmartReply" in Rfc822Output" 2011-03-01 13:58:36 -08:00
Marc Blank
81273dfcee Fix deadlock issue in AttachmentDownloadService
* When a connectivity wait was added to processQueue, I neglected
  to consider that a lock was held during this time
* The fix is to move the check for connectivity out of processQueue

Bug: 3500702

Change-Id: I646cf899ff895d9838612e89b15b66f1084840b1
2011-03-01 13:43:44 -08:00
Todd Kennedy
0d49ef78eb Change "appendQuotedText" to "useSmartReply" in Rfc822Output
Slight API change to make it more clear what the method parameter is for.
Also add some additonal test conditions to the Rfc822Output tests.

Change-Id: I8888d6201e79136fa3420aa9d5f921772f374e56
2011-03-01 13:30:21 -08:00
Ying Wang
c28bf35319 Split out emailcommon/Android.mk
Change-Id: I90653e8601ee3ee6a8719d87ffb93222a11a22c0
2011-03-01 12:29:05 -08:00
Makoto Onuki
23d6be4d21 Merge "Update screen properly when # of accounts becomes 1 from 2" 2011-03-01 11:20:31 -08:00
Eric Fischer
1152227517 Merge "Import revised translations." 2011-03-01 11:11:48 -08:00
Eric Fischer
19bc36db61 Import revised translations.
Change-Id: I83e41167865dc8db12aedcb0ec298a18be024c5b
2011-03-01 11:01:08 -08:00
Andy Stadler
25446fd431 am f912a7e8: (-s ours) am 067c874c: DO NOT MERGE: Backport fix for IMAP delete bug
* commit 'f912a7e82705cd7adf941806b354ad8f454079b1':
  DO NOT MERGE: Backport fix for IMAP delete bug
2011-03-01 10:58:14 -08:00
Andy Stadler
30793aa791 Merge "Add parent key to Mailbox schema" 2011-03-01 10:46:56 -08:00
Andy Stadler
3a58509b2a Add parent key to Mailbox schema
Bug: 2028418
Change-Id: I79d48befe7754692a3cab6c8851105bb399431f5
2011-03-01 10:45:50 -08:00
Todd Kennedy
4feb5c871b Merge "Fix unit test build" 2011-03-01 08:46:15 -08:00
Todd Kennedy
bdf1a7eb6e Fix unit test build
Change-Id: I8fcb16d4b10214668daac73a7cb9e274b07c154c
2011-03-01 08:45:16 -08:00