#241: Fixed how Outlook TO, CC and BCC are handled [skip ci]

bbottema · Jan 8, 2020 · f10508e · f10508e
1 parent 9e739cd
commit f10508e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 31 deletions.
diff --git a/...le/src/main/java/org/simplejavamail/api/internal/outlooksupport/model/OutlookMessage.java b/...le/src/main/java/org/simplejavamail/api/internal/outlooksupport/model/OutlookMessage.java
@@ -40,14 +40,10 @@ public interface OutlookMessage {
 
 	String getSubject();
 
-	String getToEmail();
-
-	String getToName();
-
-	OutlookRecipient getToRecipient();
-
+	List<OutlookRecipient> getToRecipients();
+
 	List<OutlookRecipient> getCcRecipients();
-	
+
 	List<OutlookRecipient> getBccRecipients();
 
 	@SuppressWarnings("ElementOnlyUsedFromTestCode")

diff --git a/modules/outlook-module/pom.xml b/modules/outlook-module/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>outlook-message-parser</artifactId>
-            <version>1.5.0</version>
+            <version>1.6.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookEmailConverter.java b/...main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookEmailConverter.java
@@ -78,23 +78,15 @@ private static EmailFromOutlookMessage buildEmailFromOutlookMessage(
 
 	private static void copyReceiversFromOutlookMessage(@NotNull EmailPopulatingBuilder builder, @NotNull OutlookMessage outlookMessage) {
 		//noinspection QuestionableName
+		for (final OutlookRecipient to : outlookMessage.getToRecipients()) {
+			builder.to(to.getName(), to.getAddress());
+		}
 		for (final OutlookRecipient cc : outlookMessage.getCcRecipients()) {
 			builder.cc(cc.getName(), cc.getAddress());
 		}
 		for (final OutlookRecipient bcc : outlookMessage.getBccRecipients()) {
 			builder.bcc(bcc.getName(), bcc.getAddress());
 		}
-		// only add remaining recipients...
-		outerloop:
-		for (final OutlookRecipient to : outlookMessage.getRecipients()) {
-			for (final Recipient recipient : builder.getRecipients()) {
-				if (Objects.equals(recipient.getName(), to.getName()) &&
-						Objects.equals(recipient.getAddress(), to.getAddress())) {
-					continue outerloop;
-				}
-			}
-			builder.to(to.getName(), to.getAddress());
-		}
 	}
 
 	@NotNull

diff --git a/...n/java/org/simplejavamail/internal/outlooksupport/internal/model/OutlookMessageProxy.java b/...n/java/org/simplejavamail/internal/outlooksupport/internal/model/OutlookMessageProxy.java
@@ -104,18 +104,8 @@ public String getSubject() {
 	}
 
 	@Override
-	public String getToEmail() {
-		return delegate.getToEmail();
-	}
-
-	@Override
-	public String getToName() {
-		return delegate.getToName();
-	}
-
-	@Override
-	public OutlookRecipient getToRecipient() {
-		return new OutlookRecipientProxy(delegate.getToRecipient());
+	public List<OutlookRecipient> getToRecipients() {
+		return wrapRecipients(delegate.getToRecipients());
 	}
 
 	@Override