diff options
| author | Yu Ping Hu <yph@google.com> | 2013-05-16 18:43:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-16 18:43:26 +0000 |
| commit | 67b38031abbbf35b10854d3c8d3b4adf7cb08aaa (patch) | |
| tree | b68040efea5aed07202ddb9c806ba586bfeff971 /src | |
| parent | fff905416f2f786f0483dc627af04524d81a76ab (diff) | |
| parent | 7c3f85885c767b58eaa4dbbc8e8339bd567b73eb (diff) | |
| download | android_packages_apps_Email-67b38031abbbf35b10854d3c8d3b4adf7cb08aaa.tar.gz android_packages_apps_Email-67b38031abbbf35b10854d3c8d3b4adf7cb08aaa.tar.bz2 android_packages_apps_Email-67b38031abbbf35b10854d3c8d3b4adf7cb08aaa.zip | |
Merge "Changes to support cleaving sync out of ExchangeService." into jb-ub-mail-ur9
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/email/mail/transport/SmtpSender.java | 5 | ||||
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/com/android/email/mail/transport/SmtpSender.java b/src/com/android/email/mail/transport/SmtpSender.java index 1d7a3d658..abd87bd64 100644 --- a/src/com/android/email/mail/transport/SmtpSender.java +++ b/src/com/android/email/mail/transport/SmtpSender.java @@ -190,10 +190,11 @@ public class SmtpSender extends Sender { } executeSimpleCommand("DATA"); // TODO byte stuffing - Rfc822Output.writeTo(mContext, messageId, + Rfc822Output.writeTo(mContext, message, new EOLConvertingOutputStream(mTransport.getOutputStream()), false /* do not use smart reply */, - false /* do not send BCC */); + false /* do not send BCC */, + null /* attachments are in the message itself */); executeSimpleCommand("\r\n."); } catch (IOException ioe) { throw new MessagingException("Unable to send message", ioe); diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 2e9e854f0..ead947346 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -3148,13 +3148,16 @@ public class EmailProvider extends ContentProvider { final Uri uri = EmailContent.Message.CONTENT_URI; resolver.update(uri, contentValues, MessageColumns.MAILBOX_KEY + " = ?", new String[] {String.valueOf(mailbox.mId)}); - // If it's been long enough, force sync this mailbox. - final long timeSinceLastSync = - System.currentTimeMillis() - mailbox.mSyncTime; - if (timeSinceLastSync > AUTO_REFRESH_INTERVAL_MS) { - final Uri refreshUri = Uri.parse(EmailContent.CONTENT_URI + "/" + - QUERY_UIREFRESH + "/" + mailbox.mId); - resolver.query(refreshUri, null, null, null, null); + // For non-push mailboxes, if it's stale (i.e. last sync was a while + // ago), force a sync. + if (mailbox.mSyncInterval > Mailbox.CHECK_INTERVAL_PUSH) { + final long timeSinceLastSync = + System.currentTimeMillis() - mailbox.mSyncTime; + if (timeSinceLastSync > AUTO_REFRESH_INTERVAL_MS) { + final Uri refreshUri = Uri.parse(EmailContent.CONTENT_URI + + "/" + QUERY_UIREFRESH + "/" + mailbox.mId); + resolver.query(refreshUri, null, null, null, null); + } } } } |