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
diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 7cfcc6b..626283a 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -60,10 +60,6 @@
private static final String COMBINED_SELECTION =
"(url LIKE ? OR url LIKE ? OR url LIKE ? OR url LIKE ? OR title LIKE ?)";
- // 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://)(.*?)(/$)?");
-
Context mContext;
Filter mFilter;
SuggestionResults mResults;
@@ -475,7 +471,7 @@
*/
private String getTitle(String title, String url) {
if (TextUtils.isEmpty(title) || TextUtils.getTrimmedLength(title) == 0) {
- title = stripUrl(url);
+ title = UrlUtils.stripUrl(url);
}
return title;
}
@@ -493,31 +489,9 @@
|| title.equals(url)) {
return null;
} else {
- return stripUrl(url);
+ return UrlUtils.stripUrl(url);
}
}
-
- /**
- * 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
- */
- private 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;
- }
- }
-
}
class SearchesCursor extends CursorSource {