moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 19:52:17 -05:00
Code Issues Releases Wiki Activity

Remove duplicate code from error message generation

Browse Source
This commit is contained in:
Jesse Vincent 2010-07-10 16:41:07 +00:00
parent 56217e8ad6
commit 5aea9e7d9b
1 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/fsck/k9/controller/MessagingController.java
View File

@ -2727,10 +2727,6 @@ public class MessagingController implements Runnable
static AtomicBoolean loopCatch = new AtomicBoolean(); static AtomicBoolean loopCatch = new AtomicBoolean();
public void addErrorMessage(Account account, String subject, Throwable t) public void addErrorMessage(Account account, String subject, Throwable t)
{ {
if (K9.ENABLE_ERROR_FOLDER == false)
{
return;
}
if (loopCatch.compareAndSet(false, true) == false) if (loopCatch.compareAndSet(false, true) == false)
{ {
return; return;
@ -2742,44 +2738,16 @@ public class MessagingController implements Runnable
return; return;
} }
String rootCauseMessage = getRootCauseMessage(t);
Log.e(K9.LOG_TAG, "Error " + "'" + rootCauseMessage + "'", t);
Store localStore = account.getLocalStore();
LocalFolder localFolder = (LocalFolder)localStore.getFolder(account.getErrorFolderName());
Message[] messages = new Message[1];
MimeMessage message = new MimeMessage();
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos); PrintStream ps = new PrintStream(baos);
t.printStackTrace(ps); t.printStackTrace(ps);
ps.close(); ps.close();
message.setBody(new TextBody(baos.toString()));
message.setFlag(Flag.X_DOWNLOADED_FULL, true); if (subject == null) {
if (subject != null) subject = getRootCauseMessage(t);
{
message.setSubject(subject);
}
else
{
message.setSubject(rootCauseMessage);
}
long nowTime = System.currentTimeMillis();
Date nowDate = new Date(nowTime);
message.setInternalDate(nowDate);
message.addSentDate(nowDate);
message.setFrom(new Address(account.getEmail(), "K9mail internal"));
messages[0] = message;
localFolder.appendMessages(messages);
localFolder.deleteMessagesOlderThan(nowTime - (15 * 60 * 1000));
for (MessagingListener l : getListeners())
{
l.folderStatusChanged(account, localFolder.getName(), localFolder.getUnreadMessageCount());
} }
addErrorMessage(account, subject, baos.toString());
} }
catch (Throwable it) catch (Throwable it)
{ {