Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TextClassifier: Ensure url scheme is in lowercase" into oc-dev

Browse Source
This commit is contained in:
Abodunrinwa Toki
2017-05-12 22:50:48 +00:00
committed by Android (Google) Code Review
parent ee82be81ff 86ef9827da
commit ebd6bb561d
2 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/textclassifier/TextClassifierImpl.java
View File

@@ -624,8 +624,14 @@ final class TextClassifierImpl implements TextClassifier {
return new Intent(Intent.ACTION_VIEW)
.setData(Uri.parse(String.format("geo:0,0?q=%s", text)));
case TextClassifier.TYPE_URL:
if (!text.startsWith("https://") && !text.startsWith("http://")) {
text = "http://" + 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;
}
return new Intent(Intent.ACTION_VIEW, Uri.parse(text))
.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());