Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Move HTML Sanitation to DbThread

Browse Source
This commit is contained in:
Torsten Grote
2017-04-04 13:27:06 -03:00
parent a1b415330e
commit b7866be38d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java
View File

@@ -21,6 +21,7 @@ import org.briarproject.briar.api.blog.Blog;
import org.briarproject.briar.api.blog.BlogCommentHeader; import org.briarproject.briar.api.blog.BlogCommentHeader;
import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogManager;
import org.briarproject.briar.api.blog.BlogPostHeader; import org.briarproject.briar.api.blog.BlogPostHeader;
import org.briarproject.briar.util.HtmlUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -33,6 +34,7 @@ import javax.annotation.Nullable;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.briar.util.HtmlUtils.ARTICLE;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
@@ -229,6 +231,7 @@ abstract class BaseControllerImpl extends DbControllerImpl
return header; return header;
} }
@DatabaseExecutor
private BlogPostItem getItem(BlogPostHeader h) throws DbException { private BlogPostItem getItem(BlogPostHeader h) throws DbException {
String body; String body;
if (h instanceof BlogCommentHeader) { if (h instanceof BlogCommentHeader) {
@@ -243,10 +246,11 @@ abstract class BaseControllerImpl extends DbControllerImpl
} }
} }
@DatabaseExecutor
private String getPostBody(MessageId m) throws DbException { private String getPostBody(MessageId m) throws DbException {
String body = bodyCache.get(m); String body = bodyCache.get(m);
if (body == null) { if (body == null) {
body = blogManager.getPostBody(m); body = HtmlUtils.clean(blogManager.getPostBody(m), ARTICLE);
bodyCache.put(m, body); bodyCache.put(m, body);
} }
//noinspection ConstantConditions //noinspection ConstantConditions

4
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
View File

@@ -22,7 +22,6 @@ import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.view.ArticleMovementMethod; import org.briarproject.briar.android.view.ArticleMovementMethod;
import org.briarproject.briar.android.widget.LinkDialogFragment; import org.briarproject.briar.android.widget.LinkDialogFragment;
import org.briarproject.briar.util.HtmlUtils;
import static android.text.format.DateUtils.DAY_IN_MILLIS; import static android.text.format.DateUtils.DAY_IN_MILLIS;
import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH; import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
@@ -31,7 +30,6 @@ import static android.text.format.DateUtils.FORMAT_ABBREV_TIME;
import static android.text.format.DateUtils.FORMAT_SHOW_DATE; import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
import static android.text.format.DateUtils.WEEK_IN_MILLIS; import static android.text.format.DateUtils.WEEK_IN_MILLIS;
import static org.briarproject.briar.util.HtmlUtils.ARTICLE;
public class UiUtils { public class UiUtils {
@@ -87,7 +85,7 @@ public class UiUtils {
} }
public static Spanned getSpanned(String s) { public static Spanned getSpanned(String s) {
return Html.fromHtml(HtmlUtils.clean(s, ARTICLE)); return Html.fromHtml(s);
} }
public static void makeLinksClickable(TextView v) { public static void makeLinksClickable(TextView v) {