ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge change Ic3cbc51d into eclair

Browse Source 
* changes:
  Cleanup delete handling issues in POP3
This commit is contained in:
Android (Google) Code Review 2009-10-01 04:59:06 -04:00
commit 3ea49f2151
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@ -33,6 +33,8 @@
<!-- Do Not Translate. Unused string. --> <!-- Do Not Translate. Unused string. -->
<string name="special_mailbox_display_name_junk"></string> <string name="special_mailbox_display_name_junk"></string>
<!-- Do Not Translate. Unused string. --> <!-- Do Not Translate. Unused string. -->
<string name="account_setup_incoming_delete_policy_7days_label"></string>
<!-- Do Not Translate. Unused string. -->
<string name="account_setup_incoming_security_ssl_optional_label"></string> <string name="account_setup_incoming_security_ssl_optional_label"></string>
<!-- Do Not Translate. Unused string. --> <!-- Do Not Translate. Unused string. -->
<string name="account_setup_incoming_security_tls_optional_label"></string> <string name="account_setup_incoming_security_tls_optional_label"></string>
@ -380,8 +382,6 @@
<!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: --> <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
<string name="account_setup_incoming_delete_policy_never_label">Never</string> <string name="account_setup_incoming_delete_policy_never_label">Never</string>
<!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: --> <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
<string name="account_setup_incoming_delete_policy_7days_label">After 7 days</string>
<!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
<string name="account_setup_incoming_delete_policy_delete_label">When I delete from Inbox</string> <string name="account_setup_incoming_delete_policy_delete_label">When I delete from Inbox</string>
<!-- "Incoming server settings" screen, label for setting IMAP path prefix: --> <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->

1
src/com/android/email/MessagingController.java
View File

@ -1485,6 +1485,7 @@ public class MessagingController implements Runnable {
sentinel.mAccountKey = oldMessage.mAccountKey; sentinel.mAccountKey = oldMessage.mAccountKey;
sentinel.mMailboxKey = oldMessage.mMailboxKey; sentinel.mMailboxKey = oldMessage.mMailboxKey;
sentinel.mFlagLoaded = EmailContent.Message.FLAG_LOADED_DELETED; sentinel.mFlagLoaded = EmailContent.Message.FLAG_LOADED_DELETED;
sentinel.mFlagRead = true;
sentinel.mServerId = oldMessage.mServerId; sentinel.mServerId = oldMessage.mServerId;
sentinel.save(mContext); sentinel.save(mContext);

7
src/com/android/email/activity/setup/AccountSetupIncoming.java
View File

@ -16,6 +16,7 @@
package com.android.email.activity.setup; package com.android.email.activity.setup;
import com.android.email.Account;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
@ -119,11 +120,9 @@ public class AccountSetupIncoming extends Activity implements OnClickListener {
}; };
SpinnerOption deletePolicies[] = { SpinnerOption deletePolicies[] = {
new SpinnerOption(0, new SpinnerOption(Account.DELETE_POLICY_NEVER,
getString(R.string.account_setup_incoming_delete_policy_never_label)), getString(R.string.account_setup_incoming_delete_policy_never_label)),
new SpinnerOption(1, new SpinnerOption(Account.DELETE_POLICY_ON_DELETE,
getString(R.string.account_setup_incoming_delete_policy_7days_label)),
new SpinnerOption(2,
getString(R.string.account_setup_incoming_delete_policy_delete_label)), getString(R.string.account_setup_incoming_delete_policy_delete_label)),
}; };

2
src/com/android/email/provider/EmailContent.java
View File

@ -778,7 +778,7 @@ public abstract class EmailContent {
public static final int FLAGS_DELETE_POLICY_SHIFT = 2; public static final int FLAGS_DELETE_POLICY_SHIFT = 2;
public static final int DELETE_POLICY_NEVER = 0; 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; public static final int DELETE_POLICY_ON_DELETE = 2;
// Sentinel values for the mSyncInterval field of both Account records // Sentinel values for the mSyncInterval field of both Account records