moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

removed code from previous commit disabling of syncing drafts to be encrypted.

This commit is contained in:
ashley willis 2011-11-19 13:34:26 -06:00
parent 51c662f0d0
commit c49d1ecc8e
7 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -597,8 +597,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_crypto_auto_signature_summary">Use the account\'s email address to guess the signature key.</string>
<string name="account_settings_crypto_auto_encrypt">Auto-encrypt</string>
<string name="account_settings_crypto_auto_encrypt_summary">Automatically set encrypt if a public key matches a recipient.</string>
<string name="account_settings_crypto_dont_sync_drafts">Don\'t sync drafts</string>
<string name="account_settings_crypto_dont_sync_drafts_summary">Don\'t sync drafts marked to be encrypted. Must change drafts folder\'s sync and push class to none, or these drafts will be deleted!</string>
<string name="account_settings_mail_check_frequency_label">Folder poll frequency</string>
<string name="account_settings_second_class_check_frequency_label">2nd class check frequency</string>

7
res/xml/account_settings_preferences.xml
View File

@ -481,13 +481,6 @@
android:summary="@string/account_settings_crypto_auto_encrypt_summary"
android:dependency="crypto_app"/>
<CheckBoxPreference
android:persistent="false"
android:key="crypto_dont_sync_drafts"
android:title="@string/account_settings_crypto_dont_sync_drafts"
android:summary="@string/account_settings_crypto_dont_sync_drafts_summary"
android:dependency="crypto_app"/>
</PreferenceScreen>
</PreferenceScreen>

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

@ -150,7 +150,6 @@ public class Account implements BaseAccount {
private String mCryptoApp;
private boolean mCryptoAutoSignature;
private boolean mCryptoAutoEncrypt;
private boolean mCryptoDontSyncDrafts;
private CryptoProvider mCryptoProvider = null;
@ -243,7 +242,6 @@ public class Account implements BaseAccount {
mCryptoApp = Apg.NAME;
mCryptoAutoSignature = false;
mCryptoAutoEncrypt = false;
mCryptoDontSyncDrafts = false;
mEnabled = true;
searchableFolders = Searchable.ALL;
@ -413,7 +411,6 @@ public class Account implements BaseAccount {
mCryptoApp = prefs.getString(mUuid + ".cryptoApp", Apg.NAME);
mCryptoAutoSignature = prefs.getBoolean(mUuid + ".cryptoAutoSignature", false);
mCryptoAutoEncrypt = prefs.getBoolean(mUuid + ".cryptoAutoEncrypt", false);
mCryptoDontSyncDrafts = prefs.getBoolean(mUuid + ".cryptoDontSyncDrafts", false);
mEnabled = prefs.getBoolean(mUuid + ".enabled", true);
}
@ -487,7 +484,6 @@ public class Account implements BaseAccount {
editor.remove(mUuid + ".cryptoApp");
editor.remove(mUuid + ".cryptoAutoSignature");
editor.remove(mUuid + ".cryptoAutoEncrypt");
editor.remove(mUuid + ".cryptoDontSyncDrafts");
editor.remove(mUuid + ".enabled");
editor.remove(mUuid + ".enableMoveButtons");
editor.remove(mUuid + ".hideMoveButtonsEnum");
@ -652,7 +648,6 @@ public class Account implements BaseAccount {
editor.putString(mUuid + ".cryptoApp", mCryptoApp);
editor.putBoolean(mUuid + ".cryptoAutoSignature", mCryptoAutoSignature);
editor.putBoolean(mUuid + ".cryptoAutoEncrypt", mCryptoAutoEncrypt);
editor.putBoolean(mUuid + ".cryptoDontSyncDrafts", mCryptoAutoEncrypt);
editor.putBoolean(mUuid + ".enabled", mEnabled);
editor.putBoolean(mUuid + ".vibrate", mNotificationSetting.shouldVibrate());
@ -1484,14 +1479,6 @@ public class Account implements BaseAccount {
mCryptoAutoEncrypt = cryptoAutoEncrypt;
}
public boolean isCryptoDontSyncDrafts() {
return mCryptoDontSyncDrafts;
}
public void setCryptoDontSyncDrafts(boolean cryptoDontSyncDrafts) {
mCryptoDontSyncDrafts = cryptoDontSyncDrafts;
}
public String getInboxFolderName() {
return mInboxFolderName;
}

5
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -209,7 +209,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
private PgpData mPgpData = null;
private boolean mAutoEncrypt = false;
private boolean mDontSyncDrafts = false;
private String mReferences;
private String mInReplyTo;
@ -679,7 +678,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
updateEncryptLayout();
mAutoEncrypt = mAccount.isCryptoAutoEncrypt();
mDontSyncDrafts = mAccount.isCryptoDontSyncDrafts();
} else {
mEncryptLayout.setVisibility(View.GONE);
}
@ -2914,8 +2912,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
final MessagingController messagingController = MessagingController.getInstance(getApplication());
Message draftMessage = messagingController.saveDraft(mAccount, message,
mDontSyncDrafts && mEncryptCheckbox.isChecked());
Message draftMessage = messagingController.saveDraft(mAccount, message);
mDraftUid = draftMessage.getUid();
// Don't display the toast if the user is just changing the orientation

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

@ -98,7 +98,6 @@ public class AccountSettings extends K9PreferenceActivity {
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_ENCRYPT = "crypto_auto_encrypt";
private static final String PREFERENCE_CRYPTO_DONT_SYNC_DRAFTS = "crypto_dont_sync_drafts";
private static final String PREFERENCE_LOCAL_STORAGE_PROVIDER = "local_storage_provider";
@ -164,7 +163,6 @@ public class AccountSettings extends K9PreferenceActivity {
private ListPreference mCryptoApp;
private CheckBoxPreference mCryptoAutoSignature;
private CheckBoxPreference mCryptoAutoEncrypt;
private CheckBoxPreference mCryptoDontSyncDrafts;
private ListPreference mLocalStorageProvider;
@ -688,9 +686,6 @@ public class AccountSettings extends K9PreferenceActivity {
mCryptoAutoEncrypt = (CheckBoxPreference) findPreference(PREFERENCE_CRYPTO_AUTO_ENCRYPT);
mCryptoAutoEncrypt.setChecked(mAccount.isCryptoAutoEncrypt());
mCryptoDontSyncDrafts = (CheckBoxPreference) findPreference(PREFERENCE_CRYPTO_DONT_SYNC_DRAFTS);
mCryptoDontSyncDrafts.setChecked(mAccount.isCryptoDontSyncDrafts());
handleCryptoAppDependencies();
}
@ -698,11 +693,9 @@ public class AccountSettings extends K9PreferenceActivity {
if ("".equals(mCryptoApp.getValue())) {
mCryptoAutoSignature.setEnabled(false);
mCryptoAutoEncrypt.setEnabled(false);
mCryptoDontSyncDrafts.setEnabled(false);
} else {
mCryptoAutoSignature.setEnabled(true);
mCryptoAutoEncrypt.setEnabled(true);
mCryptoDontSyncDrafts.setEnabled(true);
}
}
@ -749,7 +742,6 @@ public class AccountSettings extends K9PreferenceActivity {
mAccount.setCryptoApp(mCryptoApp.getValue());
mAccount.setCryptoAutoSignature(mCryptoAutoSignature.isChecked());
mAccount.setCryptoAutoEncrypt(mCryptoAutoEncrypt.isChecked());
mAccount.setCryptoDontSyncDrafts(mCryptoDontSyncDrafts.isChecked());
mAccount.setLocalStorageProviderId(mLocalStorageProvider.getValue());
// In webdav account we use the exact folder name also for inbox,

18
src/com/fsck/k9/controller/MessagingController.java
View File

@ -4059,7 +4059,7 @@ public class MessagingController implements Runnable {
* @param message Message to save.
* @return Message representing the entry in the local store.
*/
public Message saveDraft(final Account account, final Message message, final boolean dontSyncDraft) {
public Message saveDraft(final Account account, final Message message) {
Message localMessage = null;
try {
LocalStore localStore = account.getLocalStore();
@ -4072,15 +4072,13 @@ public class MessagingController implements Runnable {
// Fetch the message back from the store. This is the Message that's returned to the caller.
localMessage = localFolder.getMessage(message.getUid());
localMessage.setFlag(Flag.X_DOWNLOADED_FULL, true);
if (!dontSyncDraft) {
PendingCommand command = new PendingCommand();
command.command = PENDING_COMMAND_APPEND;
command.arguments = new String[] {
localFolder.getName(),
localMessage.getUid()
};
queuePendingCommand(account, command);
}
PendingCommand command = new PendingCommand();
command.command = PENDING_COMMAND_APPEND;
command.arguments = new String[] {
localFolder.getName(),
localMessage.getUid()
};
queuePendingCommand(account, command);
processPendingCommands(account);
} catch (MessagingException e) {

1
src/com/fsck/k9/preferences/AccountSettings.java
View File

@ -28,7 +28,6 @@ public class AccountSettings {
s.put("cryptoApp", new StringSetting(Apg.NAME));
s.put("cryptoAutoSignature", new BooleanSetting(false));
//s.put("cryptoAutoEncrypt", new BooleanSetting(false)); // added to version 3?
//s.put("cryptoDontSyncDrafts", new BooleanSetting(false)); // added to version 3?
s.put("defaultQuotedTextShown", new BooleanSetting(Account.DEFAULT_QUOTED_TEXT_SHOWN));
s.put("deletePolicy", new DeletePolicySetting(Account.DELETE_POLICY_NEVER));
s.put("displayCount", new IntegerResourceSetting(K9.DEFAULT_VISIBLE_LIMIT,