Docile-Alligator
2022-02-21 12:23:13 +08:00
parent fbc0006a4f
commit 4b3e11c62d
2 changed files with 4 additions and 1 deletions

View File

@@ -93,6 +93,9 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
@Named("current_account") @Named("current_account")
SharedPreferences mCurrentAccountSharedPreferences; SharedPreferences mCurrentAccountSharedPreferences;
@Inject @Inject
@Named("nsfw_and_spoiler")
SharedPreferences mNsfwAndSpoilerSharedPreferences;
@Inject
CustomThemeWrapper mCustomThemeWrapper; CustomThemeWrapper mCustomThemeWrapper;
@Inject @Inject
Executor mExecutor; Executor mExecutor;
@@ -156,6 +159,7 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
postType = getIntent().getIntExtra(EXTRA_POST_TYPE, PostPagingSource.TYPE_FRONT_PAGE); postType = getIntent().getIntExtra(EXTRA_POST_TYPE, PostPagingSource.TYPE_FRONT_PAGE);
int filter = getIntent().getIntExtra(EXTRA_FILTER, -1000); int filter = getIntent().getIntExtra(EXTRA_FILTER, -1000);
PostFilter postFilter = new PostFilter(); PostFilter postFilter = new PostFilter();
postFilter.allowNSFW = !mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_NSFW_FOREVER, false) && mNsfwAndSpoilerSharedPreferences.getBoolean((mAccountName == null || mAccountName.equals("-") ? "" : mAccountName) + SharedPreferencesUtils.NSFW_BASE, false);
switch (filter) { switch (filter) {
case Post.NSFW_TYPE: case Post.NSFW_TYPE:
postFilter.onlyNSFW = true; postFilter.onlyNSFW = true;

View File

@@ -1629,7 +1629,6 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
@Override @Override
public void changePostFilter(PostFilter postFilter) { public void changePostFilter(PostFilter postFilter) {
this.postFilter = postFilter; this.postFilter = postFilter;
postFilter.allowNSFW = !mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_NSFW_FOREVER, false) && mNsfwAndSpoilerSharedPreferences.getBoolean((accountName == null || accountName.equals("-") ? "" : accountName) + SharedPreferencesUtils.NSFW_BASE, false);
if (mPostViewModel != null) { if (mPostViewModel != null) {
mPostViewModel.changePostFilter(postFilter); mPostViewModel.changePostFilter(postFilter);
} }