refactoring

OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java

@@ -112,6 +112,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 	private int statusBarColor = -1;
 	private boolean nightMode;
 	private boolean wasDrawerDisabled;
+	// FK-TODO: remove configureSettingsSearch?
 	private boolean configureSettingsSearch = false;
 
 	@Override

OsmAnd/src/net/osmand/plus/settings/fragments/search/IncludePreferenceInSearchResultsPredicate.java

@@ -6,6 +6,8 @@
 import net.osmand.plus.plugins.PluginsHelper;
 import net.osmand.plus.settings.fragments.SettingsScreenType;
 
+import java.util.stream.Stream;
+
 import javax.annotation.Nullable;
 
 import de.KnollFrank.lib.settingssearch.db.preference.pojo.SearchablePreferencePOJO;
@@ -20,11 +22,16 @@ public boolean includePreferenceInSearchResults(final SearchablePreferencePOJO p
 
 	private static boolean isPreferenceConnectedToAnyInactivePlugin(final SearchablePreferencePOJO preference,
 																	final Class<? extends PreferenceFragmentCompat> hostOfPreference) {
+		return IncludePreferenceInSearchResultsPredicate
+				.getInactivePlugins()
+				.anyMatch(inactivePlugin -> isPreferenceConnectedToPlugin(preference, hostOfPreference, inactivePlugin));
+	}
+
+	private static Stream<OsmandPlugin> getInactivePlugins() {
 		return PluginsHelper
 				.getAvailablePlugins()
 				.stream()
-				.filter(plugin -> !plugin.isActive())
-				.anyMatch(inactivePlugin -> isPreferenceConnectedToPlugin(preference, hostOfPreference, inactivePlugin));
+				.filter(plugin -> !plugin.isActive());
 	}
 
 	private static boolean isPreferenceConnectedToPlugin(final SearchablePreferencePOJO preference,