From 53d791d7a4d31b91254e16a18c122b36f5847e36 Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Fri, 17 Aug 2012 12:29:08 -0700 Subject: [PATCH] Remove Imap2 warning Change-Id: Ic531ef1047ba1bf8da50cae9af147cf18332d8b8 --- .../email/activity/setup/AccountSetupBasics.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java index f5dc624dc..4878ed71c 100644 --- a/src/com/android/email/activity/setup/AccountSetupBasics.java +++ b/src/com/android/email/activity/setup/AccountSetupBasics.java @@ -543,23 +543,7 @@ public class AccountSetupBasics extends AccountSetupActivity String domain = emailParts[1].trim(); mProvider = AccountSettingsUtils.findProviderForDomain(this, domain); if (mProvider != null) { - - // STOPSHIP Warn user about Imap2, if necessary 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) { NoteDialogFragment dialogFragment = NoteDialogFragment.newInstance(mProvider.note);