mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-22 16:50:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

parse html for pronouns

Browse source
This commit is contained in:
Thomas 2024-01-30 15:53:12 +01:00
parent 0400f316e6
commit ec44a6e4f3
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
View file

@ -57,6 +57,7 @@ import android.os.Looper;
import android.os.Parcelable; import android.os.Parcelable;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.TypedValue; import android.util.TypedValue;
@ -2121,6 +2122,15 @@ public class Helper {
.build(); .build();
} }
public static String parseHtml(String html) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY).toString();
} else {
//noinspection deprecation
return Html.fromHtml(html).toString();
}
}
//Enum that described actions to replace inside a toot content //Enum that described actions to replace inside a toot content
public enum PatternType { public enum PatternType {
MENTION, MENTION,

3
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchAdapter.java
View file

@ -31,6 +31,7 @@ import java.util.List;
import app.fedilab.android.databinding.DrawerAccountSearchBinding; import app.fedilab.android.databinding.DrawerAccountSearchBinding;
import app.fedilab.android.mastodon.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.mastodon.client.entities.api.Field; import app.fedilab.android.mastodon.client.entities.api.Field;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper; import app.fedilab.android.mastodon.helper.MastodonHelper;
@ -120,7 +121,7 @@ public class AccountsSearchAdapter extends ArrayAdapter<Account> implements Filt
account.pronouns = null; account.pronouns = null;
for (Field field : account.fields) { for (Field field : account.fields) {
if (field.name.trim().equalsIgnoreCase("pronouns")) { if (field.name.trim().equalsIgnoreCase("pronouns")) {
account.pronouns = field.value; account.pronouns = Helper.parseHtml(field.value);
break; break;
} }
} }

2
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
View file

@ -1429,7 +1429,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
if (accountFromUser.fields != null && accountFromUser.fields.size() > 0) { if (accountFromUser.fields != null && accountFromUser.fields.size() > 0) {
for (Field field : accountFromUser.fields) { for (Field field : accountFromUser.fields) {
if (field.name.toLowerCase().startsWith("pronoun")) { if (field.name.toLowerCase().startsWith("pronoun")) {
statusList.get(position).pronouns = field.value; statusList.get(position).pronouns = Helper.parseHtml(field.value);
break; break;
} }
} }

2
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View file

@ -484,7 +484,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
if (statusToDeal.pronouns == null && statusToDeal.account.fields != null && statusToDeal.account.fields.size() > 0) { if (statusToDeal.pronouns == null && statusToDeal.account.fields != null && statusToDeal.account.fields.size() > 0) {
for (Field field : statusToDeal.account.fields) { for (Field field : statusToDeal.account.fields) {
if (field.name.toLowerCase().startsWith("pronoun")) { if (field.name.toLowerCase().startsWith("pronoun")) {
statusToDeal.pronouns = field.value; statusToDeal.pronouns = Helper.parseHtml(field.value);
break; break;
} }
} }