Minor bugfix about autoconfiguration (a710a22e) · Commits · e / os / Mail

k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupPresenter.java

+12 −32

Original line number	Diff line number	Diff line
		@@ -137,13 +137,7 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter {

		@Override
		public void onManualSetupButtonClicked(String email, String password) {
		if (accountConfig == null) {
		accountConfig = new AccountConfigImpl();
		}

		accountConfig.init(email, password);

		view.goToAccountType();
		manualSetup(email, password);
		}

		@Override
		@@ -189,24 +183,6 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter {
		view.setMessage(R.string.account_setup_check_settings_retr_info_msg);

		findProvider(accountConfig.getEmail());

		/* String domain = emailHelper.splitEmail(accountConfig.getEmail())[1];

		Provider provider = findProviderForDomain(domain);
		if (provider == null) {
		accountConfig.init(accountConfig.getEmail(), password);

		view.goToAccountType();
		return;
		}

		try {
		modifyAccount(accountConfig.getEmail(), password, provider);

		checkIncomingAndOutgoing();
		} catch (URISyntaxException e) {
		view.goToAccountType();
		} */
		}

		private void findProvider(final String email) {
		@@ -254,14 +230,8 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter {
		}

		if (provider == null) {
		view.goToAccountType();
		manualSetup(accountConfig.getEmail(), password);
		}

		/* if (provider.note != null) {
		showDialog(DIALOG_NOTE);
		} else {
		finishAutoSetup();
		} */
		}
		}.execute();
		}
		@@ -1558,6 +1528,16 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter {
		this.makeDefault = makeDefault;
		}

		private void manualSetup(String email, String password) {
		if (accountConfig == null) {
		accountConfig = new AccountConfigImpl();
		}

		accountConfig.init(email, password);

		view.goToAccountType();
		}

		static class AccountSetupStatus {
		private ConnectionSecurity incomingSecurityType;
		private AuthType incomingAuthType;