Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Update method name, remove redundant HTML conversion.

Browse Source
This commit is contained in:
akwizgran
2025-10-25 13:47:45 +01:00
parent 1c1c6096b5
commit d56d634cc1
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java
View File

@@ -18,7 +18,6 @@ import org.briarproject.briar.api.blog.BlogPostHeader;
import org.briarproject.nullsafety.NotNullByDefault; import org.briarproject.nullsafety.NotNullByDefault;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.core.text.HtmlCompat;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@@ -107,9 +106,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
} }
// post text // post text
String rawText = item.getText() != null ? item.getText() : ""; Spanned postText = getSpanned(item.getText());
Spanned postText = item.isRssFeed() ? getSpanned(rawText) :
HtmlCompat.fromHtml(rawText, HtmlCompat.FROM_HTML_MODE_COMPACT);
if (fullText) { if (fullText) {
text.setText(postText); text.setText(postText);
text.setTextIsSelectable(true); text.setTextIsSelectable(true);

20
briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.blog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.util.Linkify;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.ProgressBar; import android.widget.ProgressBar;
@@ -14,7 +13,6 @@ import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.IdentityManager;
import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.identity.LocalAuthor;
import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
@@ -26,7 +24,6 @@ import org.briarproject.briar.api.attachment.AttachmentHeader;
import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogManager;
import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPost;
import org.briarproject.briar.api.blog.BlogPostFactory; import org.briarproject.briar.api.blog.BlogPostFactory;
import org.briarproject.briar.util.HtmlUtils;
import org.briarproject.nullsafety.MethodsNotNullByDefault; import org.briarproject.nullsafety.MethodsNotNullByDefault;
import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.briarproject.nullsafety.ParametersNotNullByDefault;
@@ -37,19 +34,24 @@ import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.text.HtmlCompat;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import static android.text.util.Linkify.WEB_URLS;
import static android.text.util.Linkify.addLinks;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import static androidx.core.text.HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL;
import static androidx.core.text.HtmlCompat.toHtml;
import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT; import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
import static org.briarproject.bramble.util.StringUtils.toUtf8;
import static org.briarproject.briar.android.view.TextSendController.SendState; import static org.briarproject.briar.android.view.TextSendController.SendState;
import static org.briarproject.briar.android.view.TextSendController.SendState.SENT; import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH; import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
import static org.briarproject.briar.util.HtmlUtils.cleanArticle;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
@@ -127,13 +129,11 @@ public class WriteBlogPostActivity extends BriarActivity
if (isNullOrEmpty(text)) throw new AssertionError(); if (isNullOrEmpty(text)) throw new AssertionError();
SpannableStringBuilder ssb = SpannableStringBuilder.valueOf(text); SpannableStringBuilder ssb = SpannableStringBuilder.valueOf(text);
Linkify.addLinks(ssb, Linkify.WEB_URLS); addLinks(ssb, WEB_URLS);
String html = HtmlUtils.clean( String html = cleanArticle(toHtml(ssb,
HtmlCompat.toHtml(ssb, TO_HTML_PARAGRAPH_LINES_INDIVIDUAL));
HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL),
HtmlUtils.ARTICLE);
int textLength = StringUtils.toUtf8(html).length; int textLength = toUtf8(html).length;
if (textLength > MAX_BLOG_POST_TEXT_LENGTH) { if (textLength > MAX_BLOG_POST_TEXT_LENGTH) {
Snackbar.make(input, R.string.text_too_long, LENGTH_SHORT).show(); Snackbar.make(input, R.string.text_too_long, LENGTH_SHORT).show();
return new MutableLiveData<>(null); return new MutableLiveData<>(null);