From 9cc51b72c6902b95f65857af64eb38063aa4a42b Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Tue, 1 Mar 2011 14:20:19 -0800
Subject: 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
---
 proguard.flags | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'proguard.flags')

diff --git a/proguard.flags b/proguard.flags
index f6355d7c0..d1ebcb8f8 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -46,6 +46,11 @@
   *** setProviderContext(android.content.Context);
 }
 
+-keepclasseswithmembers class com.android.emailcommon.internet.Rfc822Output {
+  *** getHtmlBody(java.lang.String);
+  *** buildBodyText(android.content.Context, com.android.emailcommon.provider.EmailContent$Message, boolean);
+}
+
 -keepclasseswithmembers class com.android.emailcommon.mail.Address {
   <init>(java.lang.String);
   <init>(java.lang.String,java.lang.String);
@@ -60,7 +65,7 @@
 -keep class com.android.emailcommon.service.PolicySet {
   <init>(com.android.emailcommon.provider.EmailContent$Account);
   <init>(int, int, int, int, boolean, int, int, boolean);
-  *** writeAccount(...);
+  *** writeAccount(com.android.emailcommon.provider.EmailContent$Account, java.lang.String, boolean, android.content.Context);
 }
 
 -keepclasseswithmembers class com.android.email.MessagingController {
@@ -69,7 +74,7 @@
 
 -keepclasseswithmembers class com.android.emailcommon.utility.Utility {
   *** dumpCursor(android.database.Cursor);
-  *** fromUtf8(...);
+  *** fromUtf8(byte[]);
   *** isFirstUtf8Byte(byte);
   *** replaceBareLfWithCrlf(java.lang.String);
 }
@@ -185,7 +190,7 @@
 }
 
 -keep class org.apache.james.mime4j.field.Field {
-  *** getBody(...);
+  *** getBody();
 }
 
 # The following classes are used only by unit tests.
@@ -196,5 +201,8 @@
 }
 
 -keepclasseswithmembers class org.apache.commons.io.IOUtils {
-  *** toByteArray(...);
+  *** toByteArray(java.io.InputStream);
+  *** toByteArray(java.io.Reader);
+  *** toByteArray(java.io.Reader, java.lang.String);
+  *** toByteArray(java.lang.String);
 }
-- 
cgit v1.2.3