diff --git a/res/values/strings.xml b/res/values/strings.xml index bf09f7c0c..fc811b901 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -33,6 +33,8 @@ + + @@ -380,8 +382,6 @@ Never - After 7 days - When I delete from Inbox diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java index 7f5384088..879026ba0 100644 --- a/src/com/android/email/MessagingController.java +++ b/src/com/android/email/MessagingController.java @@ -1485,6 +1485,7 @@ public class MessagingController implements Runnable { sentinel.mAccountKey = oldMessage.mAccountKey; sentinel.mMailboxKey = oldMessage.mMailboxKey; sentinel.mFlagLoaded = EmailContent.Message.FLAG_LOADED_DELETED; + sentinel.mFlagRead = true; sentinel.mServerId = oldMessage.mServerId; sentinel.save(mContext); diff --git a/src/com/android/email/activity/setup/AccountSetupIncoming.java b/src/com/android/email/activity/setup/AccountSetupIncoming.java index 82eb2f37c..f8625e15e 100644 --- a/src/com/android/email/activity/setup/AccountSetupIncoming.java +++ b/src/com/android/email/activity/setup/AccountSetupIncoming.java @@ -16,6 +16,7 @@ package com.android.email.activity.setup; +import com.android.email.Account; import com.android.email.R; import com.android.email.Utility; import com.android.email.provider.EmailContent; @@ -119,11 +120,9 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { }; SpinnerOption deletePolicies[] = { - new SpinnerOption(0, + new SpinnerOption(Account.DELETE_POLICY_NEVER, getString(R.string.account_setup_incoming_delete_policy_never_label)), - new SpinnerOption(1, - getString(R.string.account_setup_incoming_delete_policy_7days_label)), - new SpinnerOption(2, + new SpinnerOption(Account.DELETE_POLICY_ON_DELETE, getString(R.string.account_setup_incoming_delete_policy_delete_label)), }; diff --git a/src/com/android/email/provider/EmailContent.java b/src/com/android/email/provider/EmailContent.java index 430854468..65f677586 100644 --- a/src/com/android/email/provider/EmailContent.java +++ b/src/com/android/email/provider/EmailContent.java @@ -778,7 +778,7 @@ public abstract class EmailContent { public static final int FLAGS_DELETE_POLICY_SHIFT = 2; public static final int DELETE_POLICY_NEVER = 0; - public static final int DELETE_POLICY_7DAYS = 1; + public static final int DELETE_POLICY_7DAYS = 1; // not supported public static final int DELETE_POLICY_ON_DELETE = 2; // Sentinel values for the mSyncInterval field of both Account records