Encode email address and password (f6db517b) · Commits · e / os / Mail

k9mail/src/main/java/io/eelo/mail/activity/Accounts.java

+17 −10

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@ package io.eelo.mail.activity;
		import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.UnsupportedEncodingException;
		import java.net.URLEncoder;
		import java.util.ArrayList;
		import java.util.Calendar;
		import java.util.EnumSet;
		@@ -467,17 +469,22 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
		private boolean hasPasswordUpdate(Account account,
		String deviceAccountEmailId,
		String deviceAccountPassword) {
		String deviceAccountStoreUri = "imap+ssl+://" + deviceAccountEmailId
		.replace("@", "%40") + ":" + deviceAccountPassword
		+ "@mail.eelo.io";
		String deviceAccountTransportUri = "smtp+tls+://" + deviceAccountEmailId
		.replace("@", "%40") + ":" + deviceAccountPassword
		+ "@mail.eelo.io";
		try {
		String deviceAccountStoreUri = "imap+ssl+://" +
		URLEncoder.encode(deviceAccountEmailId, "UTF-8") + ":" +
		URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.eelo.io";
		String deviceAccountTransportUri = "smtp+tls+://" +
		URLEncoder.encode(deviceAccountEmailId, "UTF-8") + ":" +
		URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.eelo.io";

		if (deviceAccountStoreUri.equals(account.getStoreUri()) &&
		deviceAccountTransportUri.equals(account.getTransportUri())) {
		return false;
		}
		}
		catch (UnsupportedEncodingException e) {
		e.printStackTrace();
		}
		return true;
		}