Extract method to construct account display name (1a74420e) · Commits · e / os / Mail

k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -134,12 +134,8 @@ public class SettingsImporter {
		// will not be null.
		if (imported.accounts != null) {
		for (ImportedAccount account : imported.accounts.values()) {
		String name = account.name;
		if (TextUtils.isEmpty(name) && account.identities != null && account.identities.size() > 0){
		name = account.identities.get(0).email;
		}

		accounts.add(new AccountDescription(name, account.uuid));
		String accountName = getAccountDisplayName(account);
		accounts.add(new AccountDescription(accountName, account.uuid));
		}
		}

		@@ -1098,6 +1094,14 @@ public class SettingsImporter {
		return folder;
		}

		private static String getAccountDisplayName(ImportedAccount account) {
		String name = account.name;
		if (TextUtils.isEmpty(name) && account.identities != null && account.identities.size() > 0){
		name = account.identities.get(0).email;
		}
		return name;
		}

		private static class ImportedServerSettings extends ServerSettings {
		private final ImportedServer mImportedServer;