diff options
Diffstat (limited to 'app/src/main/java/app/fedilab')
3 files changed, 31 insertions, 17 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchAdapter.java index a5a72862e..40449cdf6 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchAdapter.java @@ -15,6 +15,7 @@ package app.fedilab.android.mastodon.ui.drawer; * see <http://www.gnu.org/licenses>. */ import android.content.Context; +import android.content.SharedPreferences; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -23,11 +24,13 @@ import android.widget.Filter; import android.widget.Filterable; import androidx.annotation.NonNull; +import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.RecyclerView; import java.util.ArrayList; import java.util.List; +import app.fedilab.android.R; import app.fedilab.android.databinding.DrawerAccountSearchBinding; import app.fedilab.android.mastodon.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Field; @@ -120,10 +123,14 @@ public class AccountsSearchAdapter extends ArrayAdapter<Account> implements Filt holder.binding.accountDn.setText(account.display_name); holder.binding.accountDn.setVisibility(View.VISIBLE); account.pronouns = null; - for (Field field : account.fields) { - if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) { - account.pronouns = Helper.parseHtml(field.value); - break; + SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + boolean pronounsSupport = sharedpreferences.getBoolean(getContext().getString(R.string.SET_PRONOUNS_SUPPORT), true); + if(pronounsSupport) { + for (Field field : account.fields) { + if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) { + account.pronouns = Helper.parseHtml(field.value); + break; + } } } if (account.pronouns != null) { diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java index 09bab05ac..220db6802 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java @@ -1427,11 +1427,14 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder Status statusFromUser = statusList.get(position - 1); Account accountFromUser = statusFromUser.account; statusFromUser.pronouns = null; - if (accountFromUser.fields != null && accountFromUser.fields.size() > 0) { - for (Field field : accountFromUser.fields) { - if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) { - statusList.get(position).pronouns = Helper.parseHtml(field.value); - break; + boolean pronounsSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_PRONOUNS_SUPPORT), true); + if(pronounsSupport) { + if (accountFromUser.fields != null && accountFromUser.fields.size() > 0) { + for (Field field : accountFromUser.fields) { + if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) { + statusList.get(position).pronouns = Helper.parseHtml(field.value); + break; + } } } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index 188378f0d..596d25fa4 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -482,17 +482,21 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> } String loadMediaType = sharedpreferences.getString(context.getString(R.string.SET_LOAD_MEDIA_TYPE), "ALWAYS"); - if (statusToDeal.pronouns == null && statusToDeal.account.fields != null && statusToDeal.account.fields.size() > 0) { - for (Field field : statusToDeal.account.fields) { - if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) { - statusToDeal.pronouns = Helper.parseHtml(field.value); - break; + boolean pronounsSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_PRONOUNS_SUPPORT), true); + if(pronounsSupport) { + if (statusToDeal.pronouns == null && statusToDeal.account.fields != null && statusToDeal.account.fields.size() > 0) { + for (Field field : statusToDeal.account.fields) { + if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) { + statusToDeal.pronouns = Helper.parseHtml(field.value); + break; + } + } + if (statusToDeal.pronouns == null) { + statusToDeal.pronouns = "none"; } - } - if (statusToDeal.pronouns == null) { - statusToDeal.pronouns = "none"; } } + if (statusToDeal.pronouns != null && !statusToDeal.pronouns.equalsIgnoreCase("none")) { holder.binding.pronouns.setVisibility(View.VISIBLE); holder.binding.pronouns.setText(statusToDeal.pronouns); |