From 507a58b0240514e7302a4e9f17f7565aecc94f8f Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 28 Mar 2020 09:17:54 +0100 Subject: [PATCH] Some fixes --- .../android/drawers/ArtListAdapter.java | 19 ++++++++++++------- .../android/drawers/PixelfedListAdapter.java | 16 ++++++++++------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java index 5663a0c20..a617de672 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java @@ -57,6 +57,8 @@ import app.fedilab.android.sqlite.Sqlite; import app.fedilab.android.sqlite.StatusCacheDAO; import es.dmoral.toasty.Toasty; +import static android.content.Context.MODE_PRIVATE; + /** * Created by Thomas on 14/01/2019. @@ -112,15 +114,18 @@ public class ArtListAdapter extends RecyclerView.Adapter implements OnPostAction @Override public int getItemViewType(int position) { - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_account_boosts = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_BOOSTS, true); - boolean show_account_replies = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_REPLIES, true); - boolean isDisplayed = Helper.filterToots(statuses.get(position), RetrieveFeedsAsyncTask.Type.ART, context instanceof ShowAccountActivity, show_account_boosts, show_account_replies); - - if (!isDisplayed) + boolean show_account_boosts = false; + boolean show_account_replies = false; + if (context instanceof ShowAccountActivity) { + SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); + show_account_boosts = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_BOOSTS, true); + show_account_replies = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_REPLIES, true); + } + if (!Helper.filterToots(statuses.get(position), RetrieveFeedsAsyncTask.Type.ART, context instanceof ShowAccountActivity, show_account_boosts, show_account_replies)) { return HIDDEN_STATUS; - else + } else { return DISPLAYED_STATUS; + } } @NonNull diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index 9e60bf797..3290a7881 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -351,14 +351,18 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA @Override public int getItemViewType(int position) { - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_account_boosts = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_BOOSTS, true); - boolean show_account_replies = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_REPLIES, true); - boolean isDisplayed = Helper.filterToots(statuses.get(position), type, context instanceof ShowAccountActivity, show_account_boosts, show_account_replies); - if (!isDisplayed) + boolean show_account_boosts = false; + boolean show_account_replies = false; + if (context instanceof ShowAccountActivity) { + SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); + show_account_boosts = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_BOOSTS, true); + show_account_replies = sharedpreferences.getBoolean(Helper.SHOW_ACCOUNT_REPLIES, true); + } + if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS && !Helper.filterToots(statuses.get(position), type, context instanceof ShowAccountActivity, show_account_boosts, show_account_replies)) { return HIDDEN_STATUS; - else + } else { return DISPLAYED_STATUS; + } } @NonNull