From 7f83467a070d6874e91ce35d00d4b4d2142f7530 Mon Sep 17 00:00:00 2001
From: Tim Tersch <tim.tersch@AD.BIELEFELD-GYM-HEHO.LOGODIDACT.NET>
Date: Thu, 27 Jan 2022 10:35:38 +0100
Subject: [PATCH] Mail lesbar

---
 MyMail.java | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/MyMail.java b/MyMail.java
index ff3ce37..4dfdb5b 100644
--- a/MyMail.java
+++ b/MyMail.java
@@ -1,3 +1,5 @@
+import java.util.Iterator;
+
 public class MyMail {
 
 	public static final String POP3_SERVER = "127.0.0.1";
@@ -47,7 +49,7 @@ public class MyMail {
 		// GUI erstellen und Status setzen.
 		gui = new MyMailGUI(this);
 		gui.setStatus("App gestartet");
-		
+
 		getAllMails();
 	}
 
@@ -219,7 +221,7 @@ public class MyMail {
 	 */
 	public Mail getMail(int pNumber) {
 		String mes = ""; // Speicher für Antworten des Servers
-		
+
 		// Prüfen, ob es eine Mail mit der Nummer pNumber gibt
 		int count = getMessageCount();
 		if (pNumber > count) {
@@ -229,7 +231,13 @@ public class MyMail {
 		// Mail abrufen (RETR)
 		con.send("RETR " + pNumber);
 		mes = con.receive();
+
+		boolean header = true;
+		String date = "";
+		String sender = "";
+		String subject = "";
 		String text = "";
+
 		while (!mes.equals(".")) {
 			// Text der Mail parsen
 			// Verarbeite die Metadaten, vor allem:
@@ -243,10 +251,35 @@ public class MyMail {
 			// machen.
 			// Tipp: Merk dir in einem boolean, ob du im Textkörper oder im Header bist.
 			mes = con.receive();
-			text += mes;
+			if (header) {
+				if (mes.equals("")) {
+					header = false;
+				} else if (mes.startsWith("Delivery-date")) {
+					date = mes.substring(15);
+				} else if (mes.startsWith("From")) {
+					boolean open = false;
+					for (char c : mes.toCharArray()) {
+						if (open) {
+							if (c == '>')
+								break;
+							sender += c;
+						} else if (c == '<') {
+							open = true;
+						}
+					}
+				} else if (mes.startsWith("Subject")) {
+					subject = mes.substring(9);
+				}
+			} else {
+				mes = mes.replaceAll("=C3=BC", "ü");
+				mes = mes.replaceAll("=C3=A4", "ä");
+				mes = mes.replaceAll("=C3=B6", "ö");
+				mes = mes.replaceAll("=C3=9F", "ß");
+				text += mes + "\n";
+			}
 		} // end of while
 
-		return new Mail(pNumber, "DATE", "SENDER", "SUBJECT", mes);
+		return new Mail(pNumber, date, sender, subject, text);
 	}
 
 	/**