workaround to fix bug (c4e60704) · Commits · e / os / Mail

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

+11 −10

Original line number	Diff line number	Diff line
		@@ -273,19 +273,20 @@ public class AccountSetupActivity extends AppCompatActivity implements AccountSe
		private void initializeViewListenersInBasics() {
		emailView.addTextChangedListener(validationTextWatcherInBasics);
		passwordView.addTextChangedListener(validationTextWatcherInBasics);
		emailView.setOnFocusChangeListener(new OnFocusChangeListener() {
		@Override
		public void onFocusChange(View v, boolean hasFocus) {
		if (!hasFocus) {
		presenter.onEmailEditTextLosesFocus(emailView.getText().toString());
		}

		@Override
		public void setPasswordInBasicsEnabled(boolean enabled) {
		passwordViewLayout.setEnabled(enabled);
		}
		});

		@Override
		public void setPasswordHintInBasics(String hint) {
		passwordViewLayout.setHint(hint);
		}

		@Override
		public void setPasswordAndManualSetupButtonInBasicsVisibility(int visibility) {
		passwordViewLayout.setVisibility(visibility);
		public void setManualSetupButtonInBasicsVisibility(int visibility) {
		manualSetupButton.setVisibility(visibility);
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,9 @@ interface AccountSetupContract {
		void goToIncomingSettings();

		// basics
		void setPasswordAndManualSetupButtonInBasicsVisibility(int visibility);
		void setPasswordInBasicsEnabled(boolean enabled);
		void setPasswordHintInBasics(String hint);
		void setManualSetupButtonInBasicsVisibility(int visibility);
		void setNextButtonInBasicsEnabled(boolean enabled);
		void goToAccountType();
		void goToAutoConfiguration();
		@@ -131,7 +133,6 @@ interface AccountSetupContract {
		void onManualSetupButtonClicked(String email, String password);
		void onNextButtonInBasicViewClicked(String email, String password);
		void setAccount(Account account);
		void onEmailEditTextLosesFocus(String email);
		Account getAccount();

		/* checking */

+7 −11

Original line number	Diff line number	Diff line
		@@ -149,22 +149,18 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter,
		&& emailValidator.isValidAddressOnly(email);

		if (!onlyXOAuth2(email)) {
		view.setPasswordAndManualSetupButtonInBasicsVisibility(android.view.View.VISIBLE);
		view.setPasswordInBasicsEnabled(true);
		view.setManualSetupButtonInBasicsVisibility(android.view.View.VISIBLE);
		view.setPasswordHintInBasics(context.getString(R.string.account_setup_basics_password_hint));
		} else {
		view.setPasswordInBasicsEnabled(false);
		view.setPasswordHintInBasics(context.getString(R.string.account_setup_basics_password_gmail_hint));
		view.setManualSetupButtonInBasicsVisibility(android.view.View.INVISIBLE);
		}

		view.setNextButtonInBasicsEnabled(valid);
		}

		@Override
		public void onEmailEditTextLosesFocus(String email) {
		if (onlyXOAuth2(email)) {
		view.setPasswordAndManualSetupButtonInBasicsVisibility(android.view.View.GONE);
		view.setNextButtonInBasicsEnabled(true);
		} else {
		view.setPasswordAndManualSetupButtonInBasicsVisibility(android.view.View.VISIBLE);
		}
		}

		private boolean onlyXOAuth2(String email) {
		EmailHelper emailHelper = new EmailHelper();
		String domain = emailHelper.splitEmail(email)[1];

+1 −0

Original line number	Diff line number	Diff line
		@@ -374,6 +374,7 @@ Please submit bug reports, contribute new features and ask questions at
		<string name="account_setup_basics_title">Set up a new account</string>
		<string name="account_setup_basics_email_hint">Email address</string>
		<string name="account_setup_basics_password_hint">Password</string>
		<string name="account_setup_basics_password_gmail_hint">No password needed for Gmail</string>
		<string name="account_setup_basics_show_password">Show password</string>
		<string name="account_setup_basics_manual_setup_action">Manual setup</string>