Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393612 )
Change subject: Fix title formatting in link preview dialog.
......................................................................
Fix title formatting in link preview dialog.
Bug: T180836
Change-Id: I169b532ec68498bce2c0bf3ec436bb70e7fd20ea
---
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
2 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/12/393612/1
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index ca54066..9a13159 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -38,6 +38,7 @@
import org.wikipedia.page.ExtendedBottomSheetDialogFragment;
import org.wikipedia.page.PageTitle;
import org.wikipedia.util.GeoUtil;
+import org.wikipedia.util.StringUtil;
import org.wikipedia.util.log.L;
import org.wikipedia.views.ViewUtil;
@@ -283,10 +284,10 @@
PageSummary summary = rsp.body();
if (summary != null && !summary.hasError()) {
- titleText.setText(summary.getDisplayTitle());
+
titleText.setText(StringUtil.fromHtml(summary.getDisplayTitle()));
showPreview(new LinkPreviewContents(summary,
pageTitle.getWikiSite()));
} else {
- titleText.setText(pageTitle.getDisplayText());
+
titleText.setText(StringUtil.fromHtml(pageTitle.getDisplayText()));
showError(null);
logError(summary.hasError() ? summary.getError() : null,
"Page summary network request failed");
@@ -298,7 +299,7 @@
if (!isAdded()) {
return;
}
- titleText.setText(pageTitle.getDisplayText());
+ titleText.setText(StringUtil.fromHtml(pageTitle.getDisplayText()));
showError(caught);
}
};
diff --git a/app/src/main/java/org/wikipedia/util/StringUtil.java
b/app/src/main/java/org/wikipedia/util/StringUtil.java
index c5bb8ab..5e2126e 100644
--- a/app/src/main/java/org/wikipedia/util/StringUtil.java
+++ b/app/src/main/java/org/wikipedia/util/StringUtil.java
@@ -117,7 +117,10 @@
* @param source String that may contain HTML tags.
* @return returned Spanned string that may contain spans parsed from the
HTML source.
*/
- @NonNull public static Spanned fromHtml(@NonNull String source) {
+ @NonNull public static Spanned fromHtml(@Nullable String source) {
+ if (source == null) {
+ return new SpannedString("");
+ }
if (!source.contains("<")) {
// If the string doesn't contain any hints of HTML tags, then skip
the expensive
// processing that fromHtml() performs.
--
To view, visit https://gerrit.wikimedia.org/r/393612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I169b532ec68498bce2c0bf3ec436bb70e7fd20ea
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
