More android fixes and additions (#1400)

* Fixed templateForMessage to get the correct method.
* Fixed hashmapJavaToObjectConverter to correctly convert from java.util.HashMap to mailcore::HashMap *
* Fixed fetchArticleByMessageIDOperation to correctly reflect changes in the core
* Fixed com_libmailcore_IMAPSession_folderStatusOperation to call folderStatusOperation instead of folderInfoOperation
* Added calls to PushLocalFrame and PushLocalFrame to prevent the local reference table from filling up.
* Changed signature of templateValuesForHeader and templateValuesForPart to return Map<String, Object> instead of Map<String, String> to better reflect the core methods.
* Renamed cleanHTML to cleanHTMLForPart to reflect the core method.
* Added mimeType() and setMimeType().
* Made LOCAL_FRAME_CAPACITY constant to use in calls to PushLocalFrame. Fixed indents.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/java/com/libmailcore/HTMLRendererTemplateCallback.java b/src/java/com/libmailcore/HTMLRendererTemplateCallback.java
index 57caebb1..d5840e2d 100644
--- a/src/java/com/libmailcore/HTMLRendererTemplateCallback.java
+++ b/src/java/com/libmailcore/HTMLRendererTemplateCallback.java
@@ -12,9 +12,9 @@ public interface HTMLRendererTemplateCallback {
     /** Returns true if an attachment should (such as an image) be shown. */
     boolean shouldShowPart(AbstractPart part);
     /** Returns the values used in the header template for a given template. */
-    Map<String, String> templateValuesForHeader(MessageHeader header);
+    Map<String, Object> templateValuesForHeader(MessageHeader header);
     /** Returns the values used in the attachment template for a given attachment. */
-    Map<String, String> templateValuesForPart(AbstractPart part);
+    Map<String, Object> templateValuesForPart(AbstractPart part);
     /** Returns the template for the main header of the message. */
     String templateForMainHeader(MessageHeader header);
     /** Returns the template to render an image. */
@@ -39,7 +39,7 @@ public interface HTMLRendererTemplateCallback {
         Clean a HTML string.
         The default implementation fixes broken tags, add missing &lt;html&gt;, &lt;body&gt; tags.
     */
-    String cleanHTML(String html);
+    String cleanHTMLForPart(String html);
     /**
         Filter the HTML when rendering a given part. For example, it could filter out
         dangerous HTML tags or CSS style.
diff --git a/src/java/com/libmailcore/HTMLRendererTemplateCallbackUtils.java b/src/java/com/libmailcore/HTMLRendererTemplateCallbackUtils.java
index 0cb44a33..8649e909 100644
--- a/src/java/com/libmailcore/HTMLRendererTemplateCallbackUtils.java
+++ b/src/java/com/libmailcore/HTMLRendererTemplateCallbackUtils.java
@@ -6,8 +6,8 @@ import java.util.Map;
 public class HTMLRendererTemplateCallbackUtils {
     native static boolean canPreviewPart(AbstractPart part);
     native static boolean shouldShowPart(AbstractPart part);
-    native static Map<String, String> templateValuesForHeader(MessageHeader header);
-    native static Map<String, String> templateValuesForPart(AbstractPart part);
+    native static Map<String, Object> templateValuesForHeader(MessageHeader header);
+    native static Map<String, Object> templateValuesForPart(AbstractPart part);
     native static String templateForMainHeader(MessageHeader header);
     native static String templateForImage(AbstractPart part);
     native static String templateForAttachment(AbstractPart part);
@@ -15,7 +15,7 @@ public class HTMLRendererTemplateCallbackUtils {
     native static String templateForEmbeddedMessage(AbstractMessagePart messagePart);
     native static String templateForEmbeddedMessageHeader(MessageHeader header);
     native static String templateForAttachmentSeparator();
-    native static String cleanHTML(String html);
+    native static String cleanHTMLForPart(String html);
     native static String filterHTMLForPart(String html);
     native static String filterHTMLForMessage(String html);
 }