diff --git a/res/values/strings.xml b/res/values/strings.xml index e53936a4c..5f64deb5a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -30,6 +30,9 @@ \u0020(Proc %s:%s%s) \u0020%s/%s + \u0020(Next poll @ %s) + \u0020(Polling off) + Next OK diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java index 06d280ff7..7a4154bac 100644 --- a/src/com/fsck/k9/activity/Accounts.java +++ b/src/com/fsck/k9/activity/Accounts.java @@ -46,7 +46,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC { private void setViewTitle() { - String dispString = mListener.formatHeader(Accounts.this, getString(R.string.accounts_title), mUnreadMessageCount); + String dispString = mListener.formatHeader(Accounts.this, getString(R.string.accounts_title), mUnreadMessageCount, getTimeFormat()); setTitle(dispString); } diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java index 45e1409ce..ce06472d7 100644 --- a/src/com/fsck/k9/activity/ActivityListener.java +++ b/src/com/fsck/k9/activity/ActivityListener.java @@ -1,11 +1,14 @@ package com.fsck.k9.activity; +import java.text.DateFormat; + import android.content.Context; import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.MessagingListener; import com.fsck.k9.R; +import com.fsck.k9.service.MailService; public class ActivityListener extends MessagingListener { @@ -17,7 +20,7 @@ public class ActivityListener extends MessagingListener private String mProcessingAccountDescription = null; private String mProcessingCommandTitle = null; - public String formatHeader(Context context, String activityPrefix, int unreadMessageCount) + public String formatHeader(Context context, String activityPrefix, int unreadMessageCount, DateFormat timeFormat) { String operation = null; String progress = null; @@ -48,7 +51,15 @@ public class ActivityListener extends MessagingListener } else { - operation = ""; + long nextPollTime = MailService.getNextPollTime(); + if (nextPollTime != -1) + { + operation = context.getString(R.string.status_next_poll, timeFormat.format(nextPollTime)); + } + else + { + operation = context.getString(R.string.status_polling_off); + } } return context.getString(R.string.activity_header_format, activityPrefix, diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java index 402d0ee4f..62d23aed1 100644 --- a/src/com/fsck/k9/activity/FolderList.java +++ b/src/com/fsck/k9/activity/FolderList.java @@ -74,7 +74,7 @@ public class FolderList extends K9ListActivity { public void run() { - String dispString = mAdapter.mListener.formatHeader(FolderList.this, getString(R.string.folder_list_title, mAccount.getDescription()), mUnreadMessageCount); + String dispString = mAdapter.mListener.formatHeader(FolderList.this, getString(R.string.folder_list_title, mAccount.getDescription()), mUnreadMessageCount, getTimeFormat()); setTitle(dispString); diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 4cc3a43fe..2f9d984f6 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -252,7 +252,7 @@ public class MessageList displayName = getString(R.string.special_mailbox_name_inbox); } - String dispString = mAdapter.mListener.formatHeader(MessageList.this, getString(R.string.message_list_title, mAccount.getDescription(), displayName), mUnreadMessageCount); + String dispString = mAdapter.mListener.formatHeader(MessageList.this, getString(R.string.message_list_title, mAccount.getDescription(), displayName), mUnreadMessageCount, getTimeFormat()); setTitle(dispString); }