Fixes for PR feedback

* headerForName -> headerValueForName
* setExtraHeaders made private, removed extraHeaders
* added removeHeaderForName

4 files changed, 18 insertions, 10 deletions

diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc
index 3909db7f..2a3552fa 100644
--- a/src/core/abstract/MCMessageHeader.cc
+++ b/src/core/abstract/MCMessageHeader.cc
@@ -299,8 +299,8 @@ void MessageHeader::setExtraHeaders(HashMap * headers) {
     MC_SAFE_REPLACE_COPY(HashMap, mExtraHeaders, headers);
 }
 
-HashMap * MessageHeader::extraHeaders() {
-    return mExtraHeaders;
+Array * MessageHeader::allExtraHeadersNames() {
+    return mExtraHeaders->allKeys();
 }
 
 void MessageHeader::addHeader(String * name, String * object) {
@@ -316,7 +316,7 @@ void MessageHeader::removeHeader(String * name) {
     }
 }
 
-String * MessageHeader::headerForName(String * name) {
+String * MessageHeader::headerValueForName(String * name) {
     if (mExtraHeaders) {
         return (String *) mExtraHeaders->objectForKey(name);
     }
diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h
index fce29df3..8da5f980 100644
--- a/src/core/abstract/MCMessageHeader.h
+++ b/src/core/abstract/MCMessageHeader.h
@@ -55,12 +55,10 @@ namespace mailcore {
         virtual void setUserAgent(String * userAgent);
         virtual String * userAgent();
 
-        virtual void setExtraHeaders(HashMap *headers);
-        virtual HashMap * extraHeaders();
-
         virtual void addHeader(String *name, String * value);
         virtual void removeHeader(String *name);
-        virtual String * headerForName(String *name);
+        virtual String * headerValueForName(String *name);
+        virtual Array * allExtraHeadersNames();
 
         String * extractedSubject();
         virtual String * partialExtractedSubject();
@@ -98,6 +96,7 @@ namespace mailcore {
         String * mUserAgent;
         HashMap * mExtraHeaders;
         void init(bool generateDate, bool generateMessageID);
+        void setExtraHeaders(HashMap *headers);
         Array * recipientWithReplyAll(bool replyAll, bool includeTo, bool includeCc, Array * senderEmails);
     };
 
diff --git a/src/objc/abstract/MCOMessageHeader.h b/src/objc/abstract/MCOMessageHeader.h
index 134a9598..4177dec9 100644
--- a/src/objc/abstract/MCOMessageHeader.h
+++ b/src/objc/abstract/MCOMessageHeader.h
@@ -58,7 +58,9 @@
 @property (nonatomic, copy) NSString * userAgent;
 
 - (void)addHeaderValue:(NSString *)value forName:(NSString *)name;
-- (NSString *)headerForName:(NSString *)name;
+- (void)removeHeaderForName:(NSString *)name;
+- (NSString *)headerValueForName:(NSString *)name;
+- (NSArray * /* NSString */)allHeadersNames;
 
 /** Extracted subject (also remove square brackets).*/
 - (NSString *) extractedSubject;
diff --git a/src/objc/abstract/MCOMessageHeader.mm b/src/objc/abstract/MCOMessageHeader.mm
index 3c5d4937..429d3761 100644
--- a/src/objc/abstract/MCOMessageHeader.mm
+++ b/src/objc/abstract/MCOMessageHeader.mm
@@ -98,8 +98,15 @@ MCO_OBJC_SYNTHESIZE_STRING(setUserAgent, userAgent)
     _nativeHeader->addHeader(MCO_FROM_OBJC(mailcore::String, name), MCO_FROM_OBJC(mailcore::String, value));
 }
 
-- (NSString *)headerForName:(NSString *)name {
-    return MCO_TO_OBJC(_nativeHeader->headerForName((MCO_FROM_OBJC(mailcore::String, name))));
+- (NSString *)headerValueForName:(NSString *)name {
+    return MCO_TO_OBJC(_nativeHeader->headerValueForName((MCO_FROM_OBJC(mailcore::String, name))));
+}
+- (void)removeHeaderForName:(NSString *)name {
+    _nativeHeader->removeHeader(MCO_FROM_OBJC(mailcore::String, name));
+}
+
+- (NSArray * /* NSString */)allHeadersNames {
+    return MCO_TO_OBJC(_nativeHeader->allExtraHeadersNames());
 }
 
 - (NSString *) extractedSubject