ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove Imap2 warning" into jb-ub-mail

Browse Source
This commit is contained in:
Marc Blank 2012-08-17 13:06:41 -07:00 committed by Android (Google) Code Review
commit 46656fceaa
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -543,23 +543,7 @@ public class AccountSetupBasics extends AccountSetupActivity
String domain = emailParts[1].trim(); String domain = emailParts[1].trim();
mProvider = AccountSettingsUtils.findProviderForDomain(this, domain); mProvider = AccountSettingsUtils.findProviderForDomain(this, domain);
if (mProvider != null) { if (mProvider != null) {
// STOPSHIP Warn user about Imap2, if necessary
mProvider.expandTemplates(email); mProvider.expandTemplates(email);
try {
URI uri = new URI(mProvider.incomingUri);
String scheme = uri.getScheme();
String[] schemeParts = scheme.split("\\+");
String protocol = schemeParts[0];
if (HostAuth.LEGACY_SCHEME_IMAP.equals(protocol) &&
EmailServiceUtils.isServiceAvailable(this, "imap2")) {
mProvider.note = "This account will use the new \"Push Imap\" sync adapter." +
" To use the legacy adapter, please cancel and use Manual Setup.";
}
} catch (URISyntaxException e) {
// Ignore
}
if (mProvider.note != null) { if (mProvider.note != null) {
NoteDialogFragment dialogFragment = NoteDialogFragment dialogFragment =
NoteDialogFragment.newInstance(mProvider.note); NoteDialogFragment.newInstance(mProvider.note);