author | groucho <groucho> | 2003-04-24 11:19:11 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-04-24 11:19:11 (UTC) |
commit | 9671975e21266e3bfa6f3c793a3278b67cea34b7 (patch) (unidiff) | |
tree | 876c77939cfd0e00fc844b1b5af09b2978564a6d /noncore/unsupported/mailit/emailhandler.cpp | |
parent | 51e782b9658de61dc02579e115a9c62f396609a3 (diff) | |
download | opie-9671975e21266e3bfa6f3c793a3278b67cea34b7.zip opie-9671975e21266e3bfa6f3c793a3278b67cea34b7.tar.gz opie-9671975e21266e3bfa6f3c793a3278b67cea34b7.tar.bz2 |
- reworked size filtering
- started reworking offline download
- better tab focus switching
- Hello "Whats this" capability
- Fixed parsing of To: header files (no more Delivered-To: and Reply-To: matches)
- Good bye Settings.txt, hello Config Objects and encrypted passwords
- Translation improvements (added trs)
- Parser optimizations
Diffstat (limited to 'noncore/unsupported/mailit/emailhandler.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index f6c6d60..b180051 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp | |||
@@ -104,18 +104,14 @@ void EmailHandler::getMail() | |||
104 | } | 104 | } |
105 | 105 | ||
106 | headers = FALSE; | 106 | headers = FALSE; |
107 | popClient->headersOnly(headers, 0); | 107 | //popClient->headersOnly(headers, 0); |
108 | popClient->newConnection(mailAccount.popServer, 110); | 108 | popClient->newConnection(mailAccount.popServer, 110); |
109 | } | 109 | } |
110 | 110 | ||
111 | void EmailHandler::getMailHeaders() | 111 | void EmailHandler::getMailHeaders() |
112 | { | 112 | { |
113 | popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd); | 113 | popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd); |
114 | if (mailAccount.synchronize) { | 114 | mailAccount.synchronize ? popClient->setSynchronize(mailAccount.lastServerMailCount): popClient->removeSynchronize(); |
115 | popClient->setSynchronize(mailAccount.lastServerMailCount); | ||
116 | } else { | ||
117 | popClient->removeSynchronize(); | ||
118 | } | ||
119 | 115 | ||
120 | headers = TRUE; | 116 | headers = TRUE; |
121 | popClient->headersOnly(headers, mailAccount.syncLimit); //less than requested syncLimit, download all | 117 | popClient->headersOnly(headers, mailAccount.syncLimit); //less than requested syncLimit, download all |
@@ -135,14 +131,14 @@ void EmailHandler::getMailByList(MailList *mailList) | |||
135 | popClient->setSelectedMails(mailList); | 131 | popClient->setSelectedMails(mailList); |
136 | } | 132 | } |
137 | 133 | ||
138 | void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete) | 134 | void EmailHandler::messageArrived(const QString &message, int id, uint size, bool incomplete) |
139 | { | 135 | { |
140 | Email mail; | 136 | Email mail; |
141 | 137 | ||
142 | mail.rawMail = message; | 138 | mail.rawMail = message; |
143 | mail.serverId = id; | 139 | mail.serverId = id; |
144 | mail.size = size; | 140 | mail.size = size; |
145 | mail.downloaded = complete; | 141 | mail.downloaded = incomplete; |
146 | 142 | ||
147 | emit mailArrived(mail, FALSE); | 143 | emit mailArrived(mail, FALSE); |
148 | } | 144 | } |
@@ -185,7 +181,8 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) | |||
185 | mail->from = mail->from.left(mail->from.length() - 1); | 181 | mail->from = mail->from.left(mail->from.length() - 1); |
186 | mail->from = mail->from.right(mail->from.length() - 1); | 182 | mail->from = mail->from.right(mail->from.length() - 1); |
187 | } | 183 | } |
188 | pos++; | 184 | pos++; |
185 | |||
189 | mail->fromMail = p.getString(&pos, '>', false); | 186 | mail->fromMail = p.getString(&pos, '>', false); |
190 | } else { | 187 | } else { |
191 | if ((p.separatorAt(pos) == '<') | 188 | if ((p.separatorAt(pos) == '<') |
@@ -199,28 +196,47 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) | |||
199 | } | 196 | } |
200 | } | 197 | } |
201 | 198 | ||
202 | //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To: | 199 | pos=0; |
203 | if ((pos = p.find("TO",':', 0, TRUE)) != -1) | 200 | |
201 | //Search for To: after the FROM: attribute to prevent hitting the Delivered-To: | ||
202 | while((pos = p.find("TO",':', pos+1, TRUE))!=-1) | ||
204 | { | 203 | { |
205 | pos++; | 204 | QString rec; |
206 | mail->recipients.append (p.getString(&pos, 'z', TRUE) ); | 205 | |
206 | if (p.separatorAt(pos-1)!='-') | ||
207 | { | ||
208 | pos++; | ||
209 | mail->recipients.append(p.getString(&pos, '\r', TRUE)); | ||
210 | } | ||
211 | /*else { | ||
212 | if ((p.separatorAt(pos) == '<')|| (p.separatorAt(pos) == ' ')) //No name.. nasty | ||
213 | pos++; | ||
214 | pos++; | ||
215 | mail->fromMail = p.getString(&pos, 'z', TRUE); | ||
216 | if (mail->fromMail.at(mail->fromMail.length()-1) == '>') | ||
217 | mail->fromMail.truncate(mail->fromMail.length() - 1); | ||
218 | mail->from=mail->fromMail; | ||
219 | } | ||
220 | mail->recipients.append (p.getString(&pos, 'z', TRUE) ); | ||
221 | }*/ | ||
207 | } | 222 | } |
208 | 223 | // | |
209 | //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To: | 224 | //if (pos==-1) mail->recipients.append (tr("undisclosed recipients") ); |
225 | |||
210 | if ((pos = p.find("CC",':', 0, TRUE)) != -1) | 226 | if ((pos = p.find("CC",':', 0, TRUE)) != -1) |
211 | { | 227 | { |
212 | pos++; | 228 | pos++; |
213 | mail->carbonCopies.append (p.getString(&pos, 'z', TRUE) ); | 229 | mail->carbonCopies.append (p.getString(&pos, 'z', TRUE) ); |
214 | } | 230 | } |
215 | 231 | ||
216 | |||
217 | if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { | 232 | if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { |
218 | pos++; | 233 | pos++; |
219 | mail->subject = p.getString(&pos, 'z', TRUE); | 234 | mail->subject = p.getString(&pos, 'z', TRUE); |
220 | } | 235 | } |
236 | |||
221 | if ((pos = p.find("DATE",':', 0, TRUE)) != -1) { | 237 | if ((pos = p.find("DATE",':', 0, TRUE)) != -1) { |
222 | pos++; | 238 | pos++; |
223 | mail->date = p.getString(&pos, 'z', true); | 239 | mail->date = p.getString(&pos, 'z', TRUE); |
224 | } | 240 | } |
225 | 241 | ||
226 | 242 | ||