From 68ff355e34ad88ef44078d71f4ea4da73fe8d6f3 Mon Sep 17 00:00:00 2001 From: Koji Arai Date: Sat, 29 Jun 2013 22:28:27 +0900 Subject: [PATCH] adapt to a corner case for broken server. --- src/com/fsck/k9/mail/store/Pop3Store.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/fsck/k9/mail/store/Pop3Store.java b/src/com/fsck/k9/mail/store/Pop3Store.java index 44440e4cf..f809e0955 100644 --- a/src/com/fsck/k9/mail/store/Pop3Store.java +++ b/src/com/fsck/k9/mail/store/Pop3Store.java @@ -567,8 +567,13 @@ public class Pop3Store extends Store { Pop3Message message = mMsgNumToMsgMap.get(msgNum); if (message == null) { String response = executeSimpleCommand(UIDL_COMMAND + " " + msgNum); - int uidIndex = response.lastIndexOf(' '); - String msgUid = response.substring(uidIndex + 1); + // response = "+OK msgNum msgUid" + String[] uidParts = response.split(" +"); + if (uidParts.length < 3 || !"+OK".equals(uidParts[0])) { + Log.e(K9.LOG_TAG, "ERR response: " + response); + return; + } + String msgUid = uidParts[2]; message = new Pop3Message(msgUid, this); indexMessage(msgNum, message); }