From 03bb2123f24a9ef874d508db94fcd779526c8c88 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 9 Jan 2022 16:49:16 +0100
Subject: [PATCH] Removed breadcrumbs customization

---
 .../org/schabi/newpipe/settings/SettingsActivity.java |  1 -
 .../settings/preferencesearch/PreferenceParser.java   |  3 ++-
 .../PreferenceSearchConfiguration.java                | 11 -----------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 7d56863eb..3872e5172 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -171,7 +171,6 @@ public class SettingsActivity extends AppCompatActivity implements
     @Override
     public boolean onPreferenceStartFragment(final PreferenceFragmentCompat caller,
                                              final Preference preference) {
-        preference.getExtras()
         showSettingsFragment(instantiateFragment(preference.getFragment()));
         return true;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceParser.java b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceParser.java
index ccddee97b..77136e08d 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceParser.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceParser.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * Parses the corresponding preference-file(s).
@@ -82,7 +83,7 @@ public class PreferenceParser {
     private String joinBreadcrumbs(final List<String> breadcrumbs) {
         return breadcrumbs.stream()
                 .filter(crumb -> !TextUtils.isEmpty(crumb))
-                .reduce("", searchConfiguration.getBreadcrumbConcat());
+                .collect(Collectors.joining(" > "));
     }
 
     private String getAttribute(
diff --git a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java
index 3d49140fb..50371b78b 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java
@@ -12,9 +12,6 @@ import java.util.function.BinaryOperator;
 import java.util.stream.Stream;
 
 public class PreferenceSearchConfiguration {
-    private BinaryOperator<String> breadcrumbConcat =
-            (s1, s2) -> TextUtils.isEmpty(s1) ? s2 : (s1 + " > " + s2);
-
     private PreferenceSearchFunction searcher = new PreferenceFuzzySearchFunction();
 
     private final List<String> parserIgnoreElements = Arrays.asList(
@@ -24,18 +21,10 @@ public class PreferenceSearchConfiguration {
             PreferenceScreen.class.getSimpleName());
 
 
-    public void setBreadcrumbConcat(final BinaryOperator<String> breadcrumbConcat) {
-        this.breadcrumbConcat = Objects.requireNonNull(breadcrumbConcat);
-    }
-
     public void setSearcher(final PreferenceSearchFunction searcher) {
         this.searcher = Objects.requireNonNull(searcher);
     }
 
-    public BinaryOperator<String> getBreadcrumbConcat() {
-        return breadcrumbConcat;
-    }
-
     public PreferenceSearchFunction getSearcher() {
         return searcher;
     }