moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-10 11:35:11 -05:00
Code Issues Releases Wiki Activity

Code/wording cleanup

Browse Source
This commit is contained in:
cketti 2013-01-13 09:16:08 +01:00
parent 2c82351610
commit d2d7d858db
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@ -646,8 +646,8 @@ Please submit bug reports, contribute new features and ask questions at
<string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string> <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>
<string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string> <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>
<string name="account_settings_spamass_label">Filter using Spamassassin</string> <string name="account_settings_spamassassin_label">Filter using SpamAssassin</string>
<string name="account_settings_spamass_summary">Move Flagged Spam messages to Spam folder.</string> <string name="account_settings_spamassassin_summary">Move flagged spam messages to Spam folder</string>
<string name="folder_settings_title">Folder settings</string> <string name="folder_settings_title">Folder settings</string>

7
res/xml/account_settings_preferences.xml
View File

@ -135,10 +135,9 @@
<CheckBoxPreference <CheckBoxPreference
android:persistent="false" android:persistent="false"
android:key="account_spamass" android:key="spamassassin_filtering"
android:title="@string/account_settings_spamass_label" android:title="@string/account_settings_spamassassin_label"
android:defaultValue="true" android:summary="@string/account_settings_spamassassin_summary" />
android:summary="@string/account_settings_spamass_summary" />
<ListPreference <ListPreference
android:persistent="false" android:persistent="false"

16
src/com/fsck/k9/Account.java
View File

@ -193,7 +193,7 @@ public class Account implements BaseAccount {
private boolean mReplyAfterQuote; private boolean mReplyAfterQuote;
private boolean mStripSignature; private boolean mStripSignature;
private boolean mSyncRemoteDeletions; private boolean mSyncRemoteDeletions;
private boolean mSpamassFilter; private boolean mSpamAssassinFilterEnabled;
private String mCryptoApp; private String mCryptoApp;
private boolean mCryptoAutoSignature; private boolean mCryptoAutoSignature;
private boolean mCryptoAutoEncrypt; private boolean mCryptoAutoEncrypt;
@ -303,7 +303,7 @@ public class Account implements BaseAccount {
mReplyAfterQuote = DEFAULT_REPLY_AFTER_QUOTE; mReplyAfterQuote = DEFAULT_REPLY_AFTER_QUOTE;
mStripSignature = DEFAULT_STRIP_SIGNATURE; mStripSignature = DEFAULT_STRIP_SIGNATURE;
mSyncRemoteDeletions = true; mSyncRemoteDeletions = true;
mSpamassFilter = false; mSpamAssassinFilterEnabled = false;
mCryptoApp = Apg.NAME; mCryptoApp = Apg.NAME;
mCryptoAutoSignature = false; mCryptoAutoSignature = false;
mCryptoAutoEncrypt = false; mCryptoAutoEncrypt = false;
@ -373,7 +373,7 @@ public class Account implements BaseAccount {
mSpamFolderName = prefs.getString(mUuid + ".spamFolderName", "Spam"); mSpamFolderName = prefs.getString(mUuid + ".spamFolderName", "Spam");
mExpungePolicy = prefs.getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY); mExpungePolicy = prefs.getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY);
mSyncRemoteDeletions = prefs.getBoolean(mUuid + ".syncRemoteDeletions", true); mSyncRemoteDeletions = prefs.getBoolean(mUuid + ".syncRemoteDeletions", true);
mSpamassFilter = prefs.getBoolean(mUuid + ".spamassFilter", false); mSpamAssassinFilterEnabled = prefs.getBoolean(mUuid + ".spamAssassinFiltering", false);
mMaxPushFolders = prefs.getInt(mUuid + ".maxPushFolders", 10); mMaxPushFolders = prefs.getInt(mUuid + ".maxPushFolders", 10);
goToUnreadMessageSearch = prefs.getBoolean(mUuid + ".goToUnreadMessageSearch", false); goToUnreadMessageSearch = prefs.getBoolean(mUuid + ".goToUnreadMessageSearch", false);
@ -701,7 +701,7 @@ public class Account implements BaseAccount {
editor.putBoolean(mUuid + ".signatureBeforeQuotedText", this.mIsSignatureBeforeQuotedText); editor.putBoolean(mUuid + ".signatureBeforeQuotedText", this.mIsSignatureBeforeQuotedText);
editor.putString(mUuid + ".expungePolicy", mExpungePolicy); editor.putString(mUuid + ".expungePolicy", mExpungePolicy);
editor.putBoolean(mUuid + ".syncRemoteDeletions", mSyncRemoteDeletions); editor.putBoolean(mUuid + ".syncRemoteDeletions", mSyncRemoteDeletions);
editor.putBoolean(mUuid + ".spamassfilter", mSpamassFilter); editor.putBoolean(mUuid + ".spamAssassinFiltering", mSpamAssassinFilterEnabled);
editor.putInt(mUuid + ".maxPushFolders", mMaxPushFolders); editor.putInt(mUuid + ".maxPushFolders", mMaxPushFolders);
editor.putString(mUuid + ".searchableFolders", searchableFolders.name()); editor.putString(mUuid + ".searchableFolders", searchableFolders.name());
editor.putInt(mUuid + ".chipColor", mChipColor); editor.putInt(mUuid + ".chipColor", mChipColor);
@ -1710,12 +1710,12 @@ public class Account implements BaseAccount {
mSyncRemoteDeletions = syncRemoteDeletions; mSyncRemoteDeletions = syncRemoteDeletions;
} }
public synchronized boolean spamassFilter() { public synchronized boolean isSpamAssassinFilterEnabled() {
return mSpamassFilter; return mSpamAssassinFilterEnabled;
} }
public synchronized void setSpamassFilter(boolean spamassFilter) { public synchronized void setSpamAssassinFilterEnabled(boolean enabled) {
mSpamassFilter = spamassFilter; mSpamAssassinFilterEnabled = enabled;
} }
public synchronized String getLastSelectedFolderName() { public synchronized String getLastSelectedFolderName() {

8
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -109,7 +109,7 @@ public class AccountSettings extends K9PreferenceActivity {
private static final String PREFERENCE_STRIP_SIGNATURE = "strip_signature"; private static final String PREFERENCE_STRIP_SIGNATURE = "strip_signature";
private static final String PREFERENCE_SYNC_REMOTE_DELETIONS = "account_sync_remote_deletetions"; private static final String PREFERENCE_SYNC_REMOTE_DELETIONS = "account_sync_remote_deletetions";
private static final String PREFERENCE_CRYPTO = "crypto"; private static final String PREFERENCE_CRYPTO = "crypto";
private static final String PREFERENCE_SPAMASS = "account_spamass"; private static final String PREFERENCE_SPAMASSASSIN_FILTERING = "spamassassin_filtering";
private static final String PREFERENCE_CRYPTO_APP = "crypto_app"; private static final String PREFERENCE_CRYPTO_APP = "crypto_app";
private static final String PREFERENCE_CRYPTO_AUTO_SIGNATURE = "crypto_auto_signature"; private static final String PREFERENCE_CRYPTO_AUTO_SIGNATURE = "crypto_auto_signature";
private static final String PREFERENCE_CRYPTO_AUTO_ENCRYPT = "crypto_auto_encrypt"; private static final String PREFERENCE_CRYPTO_AUTO_ENCRYPT = "crypto_auto_encrypt";
@ -391,8 +391,8 @@ public class AccountSettings extends K9PreferenceActivity {
mSyncRemoteDeletions = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_REMOTE_DELETIONS); mSyncRemoteDeletions = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_REMOTE_DELETIONS);
mSyncRemoteDeletions.setChecked(mAccount.syncRemoteDeletions()); mSyncRemoteDeletions.setChecked(mAccount.syncRemoteDeletions());
mSpamassFilter = (CheckBoxPreference) findPreference(PREFERENCE_SPAMASS); mSpamassFilter = (CheckBoxPreference) findPreference(PREFERENCE_SPAMASSASSIN_FILTERING);
mSpamassFilter.setChecked(mAccount.spamassFilter()); mSpamassFilter.setChecked(mAccount.isSpamAssassinFilterEnabled());
mSearchableFolders = (ListPreference) findPreference(PREFERENCE_SEARCHABLE_FOLDERS); mSearchableFolders = (ListPreference) findPreference(PREFERENCE_SEARCHABLE_FOLDERS);
mSearchableFolders.setValue(mAccount.getSearchableFolders().name()); mSearchableFolders.setValue(mAccount.getSearchableFolders().name());
@ -761,7 +761,7 @@ public class AccountSettings extends K9PreferenceActivity {
mAccount.setExpungePolicy(mExpungePolicy.getValue()); mAccount.setExpungePolicy(mExpungePolicy.getValue());
} }
mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked()); mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
mAccount.setSpamassFilter(mSpamassFilter.isChecked()); mAccount.setSpamAssassinFilterEnabled(mSpamassFilter.isChecked());
mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue())); mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
mAccount.setMessageFormat(Account.MessageFormat.valueOf(mMessageFormat.getValue())); mAccount.setMessageFormat(Account.MessageFormat.valueOf(mMessageFormat.getValue()));
mAccount.setAlwaysShowCcBcc(mAlwaysShowCcBcc.isChecked()); mAccount.setAlwaysShowCcBcc(mAlwaysShowCcBcc.isChecked());