Add fallback handling

Marvin Rohrbach · bbottema · commit cee5b13b2c6d · 2019-12-18T10:43:58.000+01:00
diff --git a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java
@@ -313,7 +313,11 @@ public Map<String, OutlookFileAttachment> fetchCIDMap() {
 			for (final OutlookAttachment attachment : getOutlookAttachments()) {
 				if (attachment instanceof OutlookFileAttachment) {
 					final OutlookFileAttachment fileAttachment = (OutlookFileAttachment) attachment;
-					tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId());
+					if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId())) {
+						if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getFilename())) {
+							tryAddCid(cidMap, html, fileAttachment, fileAttachment.getLongFilename());
+						}
+					}
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,11 @@ public Map<String, OutlookFileAttachment> fetchCIDMap() {`
`313`	`313`	`for (final OutlookAttachment attachment : getOutlookAttachments()) {`
`314`	`314`	`if (attachment instanceof OutlookFileAttachment) {`
`315`	`315`	`final OutlookFileAttachment fileAttachment = (OutlookFileAttachment) attachment;`
`316`		`- tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId());`
	`316`	`+ if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId())) {`
	`317`	`+ if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getFilename())) {`
	`318`	`+ tryAddCid(cidMap, html, fileAttachment, fileAttachment.getLongFilename());`
	`319`	`+ }`
	`320`	`+ }`
`317`	`321`	`}`
`318`	`322`	`}`
`319`	`323`	`}`