From 7dd7c5ceda2c51d378169541aea4d160a4a15587 Mon Sep 17 00:00:00 2001 From: Jan Althaus Date: Tue, 8 May 2018 15:30:04 +0200 Subject: [PATCH] Remove custom schema parsing in favor of Uri This allows TextClassifier models to add support for additional protocols after launch. Bug: 79407639 Test: atest FrameworksCoreTests:TextClassificationManagerTest Test: atest FrameworksCoreTests:TextClassificationTest Test: atest CtsViewTestCases:TextClassificationManagerTest Test: atest CtsViewTestCases:TextClassifierValueObjectsTest Change-Id: I6781bf476f8c81d2106e2fb73b8f4629068bb0af --- .../view/textclassifier/TextClassifierImpl.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/java/android/view/textclassifier/TextClassifierImpl.java b/core/java/android/view/textclassifier/TextClassifierImpl.java index 2cf265d58b743..6e5751abbc40b 100644 --- a/core/java/android/view/textclassifier/TextClassifierImpl.java +++ b/core/java/android/view/textclassifier/TextClassifierImpl.java @@ -755,14 +755,8 @@ public final class TextClassifierImpl implements TextClassifier { @NonNull private static List createForUrl(Context context, String text) { - final String httpPrefix = "http://"; - final String httpsPrefix = "https://"; - if (text.toLowerCase().startsWith(httpPrefix)) { - text = httpPrefix + text.substring(httpPrefix.length()); - } else if (text.toLowerCase().startsWith(httpsPrefix)) { - text = httpsPrefix + text.substring(httpsPrefix.length()); - } else { - text = httpPrefix + text; + if (Uri.parse(text).getScheme() == null) { + text = "http://" + text; } return Arrays.asList(new LabeledIntent( context.getString(com.android.internal.R.string.browse),