diff options
author | John Reck <jreck@google.com> | 2010-10-26 19:01:24 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2010-10-29 17:09:25 -0700 |
commit | fb3017ffd8aa3f2342380270cf468e3a68914e69 (patch) | |
tree | 8480ed9bae90628844de42d663af27e7a3093e46 /src/com/android/browser/UrlUtils.java | |
parent | c54d328a499ec0c35f73e5cf57169541e8bf1cd3 (diff) | |
download | android_packages_apps_Gello-fb3017ffd8aa3f2342380270cf468e3a68914e69.tar.gz android_packages_apps_Gello-fb3017ffd8aa3f2342380270cf468e3a68914e69.tar.bz2 android_packages_apps_Gello-fb3017ffd8aa3f2342380270cf468e3a68914e69.zip |
Fixes tab title not updating correctly
Bug: 3130982
Fixes the bug where the tab title would stay the same until a new
title was received. Now the title changes to "Loading..." until a
new title is received, or changes to the URL if the page finishes
or is canceled without receiving a title.
Change-Id: I667acbaeea5383b6a434c20337d404f49b947b0d
Diffstat (limited to 'src/com/android/browser/UrlUtils.java')
-rw-r--r-- | src/com/android/browser/UrlUtils.java | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java new file mode 100644 index 00000000..cb6377a0 --- /dev/null +++ b/src/com/android/browser/UrlUtils.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.browser; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class UrlUtils { + + // Regular expression which matches http://, followed by some stuff, followed by + // optionally a trailing slash, all matched as separate groups. + private static final Pattern STRIP_URL_PATTERN = Pattern.compile("^(http://)(.*?)(/$)?"); + + private UrlUtils() { /* cannot be instantiated */ } + + /** + * Strips the provided url of preceding "http://" and any trailing "/". Does not + * strip "https://". If the provided string cannot be stripped, the original string + * is returned. + * + * TODO: Put this in TextUtils to be used by other packages doing something similar. + * + * @param url a url to strip, like "http://www.google.com/" + * @return a stripped url like "www.google.com", or the original string if it could + * not be stripped + */ + /* package */ static String stripUrl(String url) { + if (url == null) return null; + Matcher m = STRIP_URL_PATTERN.matcher(url); + if (m.matches() && m.groupCount() == 3) { + return m.group(2); + } else { + return url; + } + } +} |