mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-27 11:42:16 -05:00
Rename AccountCreator.calculateDefaultDeletePolicy()
This commit is contained in:
parent
5f14e3b4e1
commit
494b16196d
@ -13,7 +13,7 @@ import com.fsck.k9.mail.ServerSettings.Type;
|
|||||||
*/
|
*/
|
||||||
public class AccountCreator {
|
public class AccountCreator {
|
||||||
|
|
||||||
public static DeletePolicy calculateDefaultDeletePolicy(Type type) {
|
public static DeletePolicy getDefaultDeletePolicy(Type type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case IMAP: {
|
case IMAP: {
|
||||||
return DeletePolicy.ON_DELETE;
|
return DeletePolicy.ON_DELETE;
|
||||||
|
@ -321,7 +321,7 @@ public class AccountSetupBasics extends K9Activity
|
|||||||
setupFolderNames(incomingUriTemplate.getHost().toLowerCase(Locale.US));
|
setupFolderNames(incomingUriTemplate.getHost().toLowerCase(Locale.US));
|
||||||
|
|
||||||
ServerSettings incomingSettings = RemoteStore.decodeStoreUri(incomingUri.toString());
|
ServerSettings incomingSettings = RemoteStore.decodeStoreUri(incomingUri.toString());
|
||||||
mAccount.setDeletePolicy(AccountCreator.calculateDefaultDeletePolicy(incomingSettings.type));
|
mAccount.setDeletePolicy(AccountCreator.getDefaultDeletePolicy(incomingSettings.type));
|
||||||
|
|
||||||
// Check incoming here. Then check outgoing in onActivityResult()
|
// Check incoming here. Then check outgoing in onActivityResult()
|
||||||
AccountSetupCheckSettings.actionCheckSettings(this, mAccount, CheckDirection.INCOMING);
|
AccountSetupCheckSettings.actionCheckSettings(this, mAccount, CheckDirection.INCOMING);
|
||||||
|
@ -237,7 +237,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
|
|||||||
throw new Exception("Unknown account type: " + mAccount.getStoreUri());
|
throw new Exception("Unknown account type: " + mAccount.getStoreUri());
|
||||||
}
|
}
|
||||||
|
|
||||||
mAccount.setDeletePolicy(AccountCreator.calculateDefaultDeletePolicy(settings.type));
|
mAccount.setDeletePolicy(AccountCreator.getDefaultDeletePolicy(settings.type));
|
||||||
|
|
||||||
// Note that mConnectionSecurityChoices is configured above based on server type
|
// Note that mConnectionSecurityChoices is configured above based on server type
|
||||||
ConnectionSecurityAdapter securityTypesAdapter =
|
ConnectionSecurityAdapter securityTypesAdapter =
|
||||||
|
Loading…
Reference in New Issue
Block a user