fixes for whitelists
This commit is contained in:
@@ -4,7 +4,6 @@ import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import com.vk.core.dialogs.alert.VkAlertDialog;
|
||||
import com.vk.newsfeed.NewsfeedSettingsFragment;
|
||||
import com.vk.newsfeed.controllers.NewsfeedController;
|
||||
import com.vtosters.lite.R;
|
||||
import com.vtosters.lite.ui.SummaryListPreference;
|
||||
@@ -26,11 +25,6 @@ public class FeedFragment extends TrackedMaterialPreferenceToolbarFragment {
|
||||
}
|
||||
|
||||
private void prefs() {
|
||||
findPreference("officialnewssett").setOnPreferenceClickListener(preference -> {
|
||||
NavigatorUtils.switchFragment(requireContext(), NewsfeedSettingsFragment.class);
|
||||
return true;
|
||||
});
|
||||
|
||||
findPreference("sponsorpost").setOnPreferenceClickListener(preference -> {
|
||||
NavigatorUtils.switchFragment(requireContext(), SponsorPostFragment.class);
|
||||
return true;
|
||||
|
||||
@@ -65,9 +65,10 @@ public class SponsorPostFragment extends TrackedMaterialPreferenceToolbarFragmen
|
||||
PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "Sponsor Post Фильтры");
|
||||
|
||||
List<Filter> lists;
|
||||
List<Filter> downloaded = FiltersPreferences.getAllDownloadedFilters();
|
||||
|
||||
if (!NetworkUtils.isNetworkConnected() || NetworkUtils.isInternetSlow()) {
|
||||
lists = FiltersPreferences.getAllDownloadedFilters();
|
||||
lists = downloaded;
|
||||
} else {
|
||||
lists = FilterService.getFilters(null);
|
||||
}
|
||||
@@ -111,6 +112,17 @@ public class SponsorPostFragment extends TrackedMaterialPreferenceToolbarFragmen
|
||||
);
|
||||
}
|
||||
|
||||
if (!downloaded.isEmpty()) {
|
||||
PreferenceFragmentUtils.addPreference(
|
||||
getPreferenceScreen(),
|
||||
"",
|
||||
"Количество правил",
|
||||
"Используется " + FiltersPreferences.getFiltersLists().size() + " правил для фильтрации ленты",
|
||||
null,
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
PreferenceFragmentUtils.addPreference(
|
||||
getPreferenceScreen(),
|
||||
"",
|
||||
|
||||
@@ -383,7 +383,7 @@ public class NewsFeedFiltersUtils {
|
||||
Collections.emptySet()
|
||||
);
|
||||
|
||||
return whitelist.contains(id);
|
||||
return getBoolValue("invertFilters", false) != whitelist.contains(id);
|
||||
}
|
||||
|
||||
public static Boolean hasMiniAppAds(JSONObject list) {
|
||||
|
||||
Reference in New Issue
Block a user