Skip to content

Fix repo smiley22/S22.Mail issues #2 and 4# #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albertospelta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix repo smiley22/S22.Mail issues #2 and 4# #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions SerializableMailMessage/SerializableAttachment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,13 @@ public static implicit operator Attachment(SerializableAttachment attachment) {
if (attachment == null)
return null;
Attachment a = new Attachment(attachment.ContentStream, attachment.Name);

a.ContentStream.Position = 0;
a.ContentDisposition.CreationDate = attachment.ContentDisposition.CreationDate;
a.ContentDisposition.DispositionType = attachment.ContentDisposition.DispositionType;
a.ContentDisposition.FileName = attachment.ContentDisposition.FileName;
a.ContentDisposition.Inline = attachment.ContentDisposition.Inline;
a.ContentDisposition.ModificationDate = attachment.ContentDisposition.ModificationDate;
a.ContentDisposition.ReadDate = attachment.ContentDisposition.ReadDate;
a.ContentDisposition.Size = attachment.ContentDisposition.Size;
foreach (string k in attachment.ContentDisposition.Parameters.Keys)
a.ContentDisposition.Parameters.Add(k, attachment.ContentDisposition.Parameters[k]);

a.ContentStream.Position = 0;
a.NameEncoding = attachment.NameEncoding;
a.Name = attachment.Name;
a.ContentId = attachment.ContentId;
a.ContentType = attachment.ContentType;
a.TransferEncoding = attachment.TransferEncoding;
attachment.ContentDisposition.CopyTo(a.ContentDisposition);
return a;
}

Expand Down
29 changes: 19 additions & 10 deletions SerializableMailMessage/SerializableContentDisposition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,7 @@ public static implicit operator ContentDisposition(SerializableContentDispositio
if (disposition == null)
return null;
ContentDisposition d = new ContentDisposition();

d.CreationDate = disposition.CreationDate;
d.DispositionType = disposition.DispositionType;
d.FileName = disposition.FileName;
d.Inline = disposition.Inline;
d.ModificationDate = disposition.ModificationDate;
foreach (string k in disposition.Parameters.Keys)
d.Parameters.Add(k, disposition.Parameters[k]);
d.ReadDate = disposition.ReadDate;
d.Size = disposition.Size;
disposition.CopyTo(d);
return d;
}

Expand All @@ -41,6 +32,24 @@ private SerializableContentDisposition(ContentDisposition disposition) {
Size = disposition.Size;
}

public void CopyTo(ContentDisposition disposition) {
if (disposition == null)
return;

disposition.Inline = Inline;
disposition.DispositionType = DispositionType;
disposition.FileName = FileName;
disposition.CreationDate = CreationDate;
disposition.ModificationDate = ModificationDate;
disposition.ReadDate = ReadDate;
if (Size != -1L)
disposition.Size = Size;

foreach (string k in Parameters.Keys)
if (disposition.Parameters.ContainsKey(k) == false)
disposition.Parameters.Add(k, Parameters[k]);
}

public DateTime CreationDate { get; set; }
public string DispositionType { get; set; }
public string FileName { get; set; }
Expand Down