From 1d44e058664fca4d6361205831ff3a3a60fcfef4 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sun, 27 Dec 2020 20:34:04 +0100
Subject: [PATCH] Remove the "search in account names" option and do so by
 default

---
 .../main/java/com/beemdevelopment/aegis/Preferences.java   | 4 ----
 .../java/com/beemdevelopment/aegis/ui/MainActivity.java    | 3 ---
 .../com/beemdevelopment/aegis/ui/PreferencesFragment.java  | 6 ------
 .../com/beemdevelopment/aegis/ui/views/EntryAdapter.java   | 7 +------
 .../com/beemdevelopment/aegis/ui/views/EntryListView.java  | 4 ----
 app/src/main/res/values-ar-rSA/strings.xml                 | 2 --
 app/src/main/res/values-cs-rCZ/strings.xml                 | 2 --
 app/src/main/res/values-de-rDE/strings.xml                 | 2 --
 app/src/main/res/values-el-rGR/strings.xml                 | 2 --
 app/src/main/res/values-es-rES/strings.xml                 | 2 --
 app/src/main/res/values-eu-rES/strings.xml                 | 2 --
 app/src/main/res/values-fa-rIR/strings.xml                 | 2 --
 app/src/main/res/values-fi-rFI/strings.xml                 | 2 --
 app/src/main/res/values-fr-rFR/strings.xml                 | 2 --
 app/src/main/res/values-hi-rIN/strings.xml                 | 2 --
 app/src/main/res/values-hu-rHU/strings.xml                 | 2 --
 app/src/main/res/values-in-rID/strings.xml                 | 2 --
 app/src/main/res/values-it-rIT/strings.xml                 | 2 --
 app/src/main/res/values-ja-rJP/strings.xml                 | 2 --
 app/src/main/res/values-kn-rIN/strings.xml                 | 2 --
 app/src/main/res/values-nl-rNL/strings.xml                 | 2 --
 app/src/main/res/values-pl-rPL/strings.xml                 | 2 --
 app/src/main/res/values-pt-rBR/strings.xml                 | 2 --
 app/src/main/res/values-pt-rPT/strings.xml                 | 2 --
 app/src/main/res/values-ro-rRO/strings.xml                 | 2 --
 app/src/main/res/values-ru-rRU/strings.xml                 | 2 --
 app/src/main/res/values-tr-rTR/strings.xml                 | 2 --
 app/src/main/res/values-zh-rCN/strings.xml                 | 2 --
 app/src/main/res/values-zh-rTW/strings.xml                 | 2 --
 app/src/main/res/values/strings.xml                        | 2 --
 app/src/main/res/xml/preferences.xml                       | 6 ------
 31 files changed, 1 insertion(+), 79 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
index 13282cdb..eefef812 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
@@ -37,10 +37,6 @@ public class Preferences {
         return _prefs.getBoolean("pref_tap_to_reveal", false);
     }
 
-    public boolean isSearchAccountNameEnabled() {
-        return _prefs.getBoolean("pref_search_names", false);
-    }
-
     public boolean isEntryHighlightEnabled() {
         return _prefs.getBoolean("pref_highlight_entry", false);
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index 33820408..12225309 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -113,7 +113,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _entryListView.setListener(this);
         _entryListView.setCodeGroupSize(getPreferences().getCodeGroupSize());
         _entryListView.setShowAccountName(getPreferences().isAccountNameVisible());
-        _entryListView.setSearchAccountName(getPreferences().isSearchAccountNameEnabled());
         _entryListView.setHighlightEntry(getPreferences().isEntryHighlightEnabled());
         _entryListView.setTapToReveal(getPreferences().isTapToRevealEnabled());
         _entryListView.setTapToRevealTime(getPreferences().getTapToRevealTime());
@@ -235,7 +234,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             } else if (data.getBooleanExtra("needsRefresh", false)) {
                 boolean showAccountName = getPreferences().isAccountNameVisible();
                 int codeGroupSize = getPreferences().getCodeGroupSize();
-                boolean searchAccountName = getPreferences().isSearchAccountNameEnabled();
                 boolean highlightEntry = getPreferences().isEntryHighlightEnabled();
                 boolean tapToReveal = getPreferences().isTapToRevealEnabled();
                 int tapToRevealTime = getPreferences().getTapToRevealTime();
@@ -243,7 +241,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 boolean copyOnTap = getPreferences().isCopyOnTapEnabled();
                 _entryListView.setShowAccountName(showAccountName);
                 _entryListView.setCodeGroupSize(codeGroupSize);
-                _entryListView.setSearchAccountName(searchAccountName);
                 _entryListView.setHighlightEntry(highlightEntry);
                 _entryListView.setTapToReveal(tapToReveal);
                 _entryListView.setTapToRevealTime(tapToRevealTime);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
index 58704da2..7baeac9f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
@@ -245,12 +245,6 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
             }
         });
 
-        Preference searchAccountNamePreference = findPreference("pref_search_names");
-        searchAccountNamePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            _result.putExtra("needsRefresh", true);
-            return true;
-        });
-
         Preference copyOnTapPreference = findPreference("pref_copy_on_tap");
         copyOnTapPreference.setOnPreferenceChangeListener((preference, newValue) -> {
             _result.putExtra("needsRefresh", true);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
index bcbf12af..564fa7e7 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
@@ -35,7 +35,6 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
     private VaultEntry _focusedEntry;
     private int _codeGroupSize;
     private boolean _showAccountName;
-    private boolean _searchAccountName;
     private boolean _highlightEntry;
     private boolean _tempHighlightEntry;
     private boolean _tapToReveal;
@@ -85,10 +84,6 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         _tapToRevealTime = number;
     }
 
-    public void setSearchAccountName(boolean searchAccountName) {
-        _searchAccountName = searchAccountName;
-    }
-
     public void setHighlightEntry(boolean highlightEntry) {
         _highlightEntry = highlightEntry;
     }
@@ -226,7 +221,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
             return false;
         }
 
-        return !issuer.contains(_searchFilter) && !(_searchAccountName && name.contains(_searchFilter));
+        return !issuer.contains(_searchFilter) && !name.contains(_searchFilter);
     }
 
     public void refresh(boolean hard) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
index 34b271b5..4a362712 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@@ -259,10 +259,6 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _adapter.setShowAccountName(showAccountName);
     }
 
-    public void setSearchAccountName(boolean searchAccountName) {
-        _adapter.setSearchAccountName(searchAccountName);
-    }
-
     public void setHighlightEntry(boolean highlightEntry) {
         _adapter.setHighlightEntry(highlightEntry);
     }
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index c3e6dbf4..eeedcfe6 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -198,8 +198,6 @@
     <string name="group_name_hint">اسم المجموعة</string>
     <string name="preference_manage_groups">تعديل المجموعات</string>
     <string name="preference_manage_groups_summary">أدر واحذف مجموعاتك هنا</string>
-    <string name="pref_search_name_title">بحث في أسماء الحسابات</string>
-    <string name="pref_search_name_summary">إدراج أسماء الحسابات المتطابقة في نتائج البحث</string>
     <string name="pref_highlight_entry_title">ابرز الرموز عندما تُنقر</string>
     <string name="pref_highlight_entry_summary">يسهل تمييز الرموز عن بعضها بتسليط الضوء عليهم عندما يتم النقر عليهم</string>
     <string name="pref_copy_on_tap_title">انسخ الرموز عندما تنُقر</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 669c8abe..1340a563 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -215,8 +215,6 @@
     <string name="group_name_hint">Název skupiny</string>
     <string name="preference_manage_groups">Upravit skupiny</string>
     <string name="preference_manage_groups_summary">Správa a odstranění skupin</string>
-    <string name="pref_search_name_title">Hledat v názvech účtů</string>
-    <string name="pref_search_name_summary">Zahrnout shody názvů účtů do výsledků hledání</string>
     <string name="pref_highlight_entry_title">Zvýraznit tokeny po klepnutí</string>
     <string name="pref_highlight_entry_summary">Usnadnit vzájemné rozlišení tokenů dočasným zvýrazněním po kleputí</string>
     <string name="pref_copy_on_tap_title">Zkopírovat tokeny po klepnutí</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 57e842f0..98730879 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Gruppenname</string>
     <string name="preference_manage_groups">Gruppen bearbeiten</string>
     <string name="preference_manage_groups_summary">Verwalte und lösche deine Gruppen hier</string>
-    <string name="pref_search_name_title">In Kontonamen suchen</string>
-    <string name="pref_search_name_summary">Übereinstimmungen von Kontonamen in die Suchergebnisse einbeziehen</string>
     <string name="pref_highlight_entry_title">Token beim Tippen hervorheben</string>
     <string name="pref_highlight_entry_summary">Token beim Antippen hervorheben, um sie leichter voneinander unterscheiden zu können</string>
     <string name="pref_copy_on_tap_title">Token beim Tippen kopieren</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 09d916de..40d519aa 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Όνομα ομάδας</string>
     <string name="preference_manage_groups">Επεξεργασία ομάδων</string>
     <string name="preference_manage_groups_summary">Διαχειριστείτε και διαγράψτε τις ομάδες σας εδώ</string>
-    <string name="pref_search_name_title">Αναζήτηση στα ονόματα λογαριασμών</string>
-    <string name="pref_search_name_summary">Συμπερίληψη αντιστοίχισης ονόματος λογαριασμού στα αποτελέσματα αναζήτησης</string>
     <string name="pref_highlight_entry_title">Επισήμανση αναγνωριστικών όταν πατηθεί</string>
     <string name="pref_highlight_entry_summary">Κάνετε τα αναγνωριστικά να ξεχωρίζουν ευκολότερα το ένα από το άλλο, επισημαίνοντας τα προσωρινά όταν τα πατήσετε</string>
     <string name="pref_copy_on_tap_title">Αντιγράψτε τα αναγνωριστικά όταν τα πατάτε</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 43c7f2c2..214a0abe 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -192,8 +192,6 @@
     <string name="group_name_hint">Nombre del grupo</string>
     <string name="preference_manage_groups">Editar grupos</string>
     <string name="preference_manage_groups_summary">Gestione y elimine sus grupos aquí</string>
-    <string name="pref_search_name_title">Buscar en los nombres de cuenta</string>
-    <string name="pref_search_name_summary">Incluir coincidencias del nombre de la cuenta en los resultados de búsqueda</string>
     <string name="pref_highlight_entry_title">Resaltar tokens al pulsarlos</string>
     <string name="pref_highlight_entry_summary">Hace que los tokens sean más fáciles de distinguir entre ellos resaltándolos temporalmente tras ser pulsados</string>
     <string name="pref_copy_on_tap_title">Copiar tokens al pulsarlos</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 24de582f..00149fb4 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -207,8 +207,6 @@
     <string name="group_name_hint">Taldearen izena</string>
     <string name="preference_manage_groups">Editatu taldeak</string>
     <string name="preference_manage_groups_summary">Kudeatu eta ezabatu zure taldeak hemen</string>
-    <string name="pref_search_name_title">Bilatu kontu-izenetan</string>
-    <string name="pref_search_name_summary">Bilaketa-emaitzetan bat datozen kontu-izenak sartu</string>
     <string name="pref_highlight_entry_title">Nabarmendu tokenak ukitzean</string>
     <string name="pref_highlight_entry_summary">Egin elkarrengandik errazago bereizten diren tokenak, sakatzen dituzunean aldi baterako nabarmenduz</string>
     <string name="pref_copy_on_tap_title">Kopiatu tokenak ukitzean</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index a0e083f5..3717a657 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -207,8 +207,6 @@
     <string name="group_name_hint">نام گروه</string>
     <string name="preference_manage_groups">ویرایش گروه</string>
     <string name="preference_manage_groups_summary">اینجا می‌توانید گروه ها را مدیریت و یا حذف کنید</string>
-    <string name="pref_search_name_title">جستجو در نام حساب‌ها</string>
-    <string name="pref_search_name_summary">در نام حساب ها نیز جستجو انجام شود</string>
     <string name="pref_highlight_entry_title">توکن ها پس از لمس هایلایت شوند</string>
     <string name="pref_highlight_entry_summary">برای تمیز دادن توکن مورد نظر از بقیه می‌توانید آنها را به صورت موقت با لمس کردن هایلایت کنید</string>
     <string name="pref_copy_on_tap_title">کپی توکن هنگام لمس آنها</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 16bebdbd..9e7882fd 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -207,8 +207,6 @@
     <string name="group_name_hint">Ryhmän nimi</string>
     <string name="preference_manage_groups">Muokkaa ryhmiä</string>
     <string name="preference_manage_groups_summary">Hallitse ja poista ryhmiäsi täällä</string>
-    <string name="pref_search_name_title">Hae tilien nimistä</string>
-    <string name="pref_search_name_summary">Sisällytä vastaavat tilinimet hakutuloksiin</string>
     <string name="pref_highlight_entry_title">Korosta tokenit napauttamalla</string>
     <string name="pref_highlight_entry_summary">Tee tokeneista helpompi erottaa toisistaan korostamalla niitä väliaikaisesti napauttamalla</string>
     <string name="pref_copy_on_tap_title">Kopioi tokenit napauttamalla</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 9651d300..7b106f31 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Nom de groupe</string>
     <string name="preference_manage_groups">Modifier les groupes</string>
     <string name="preference_manage_groups_summary">Gérez et supprimez vos groupes ici</string>
-    <string name="pref_search_name_title">Rechercher dans les noms de comptes</string>
-    <string name="pref_search_name_summary">Inclure les correspondances de noms de comptes dans les résultats de recherche</string>
     <string name="pref_highlight_entry_title">Surligner les jetons lorsqu\'ils sont appuyés</string>
     <string name="pref_highlight_entry_summary">Rendre les jetons plus faciles à distinguer les uns des autres en les surlignant temporairement lorsqu\'ils sont appuyés</string>
     <string name="pref_copy_on_tap_title">Copier les jetons quand ils sont appuyés</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 38259294..9d9ac240 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -202,8 +202,6 @@
     <string name="group_name_hint">समूह का नाम</string>
     <string name="preference_manage_groups">समूहों को संपादित करें</string>
     <string name="preference_manage_groups_summary">यहां अपने समूहों को प्रबंधित करें और हटाएँ</string>
-    <string name="pref_search_name_title">खातों के नामों मे खोजें</string>
-    <string name="pref_search_name_summary">खोज परिणामों में खाता नाम मिलान शामिल करें</string>
     <string name="pref_highlight_entry_title">टैप करने पर टोकन हाइलाइट करें</string>
     <string name="pref_highlight_entry_summary">टैप करने पर टोकनों को एक दूसरे से अलग उजागर करने के लिए उन्हें अस्थायी रूप से हाईलाइट करें</string>
     <string name="pref_copy_on_tap_title">टैप करने पर टोकनों को कॉपी करें</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 576e466c..e5bb17cf 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -171,8 +171,6 @@
     <string name="group_name_hint">Csoportnév</string>
     <string name="preference_manage_groups">Csoportok szerkesztése</string>
     <string name="preference_manage_groups_summary">Itt kezelheti és törölheti a csoportokat</string>
-    <string name="pref_search_name_title">Keresés a fióknevekben</string>
-    <string name="pref_search_name_summary">A fióknévben egyezéseinek belevétele a találatokba</string>
     <string name="pref_highlight_entry_title">Tokenek kiemelése koppintáskor</string>
     <string name="pref_highlight_entry_summary">A tokenek könnyebb megkülönböztethetősége érdekében ideiglenesen ki lesznek emeve koppintáskor</string>
     <string name="selected">Kiválasztott</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index e702f4ac..281b3c32 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -206,8 +206,6 @@
     <string name="group_name_hint">Nama kelompok</string>
     <string name="preference_manage_groups">Ubah kelompok</string>
     <string name="preference_manage_groups_summary">Kelola dan hapus kelompok Anda di sini</string>
-    <string name="pref_search_name_title">Cari berdasarkan nama akun</string>
-    <string name="pref_search_name_summary">Sertakan nama akun yang cocok di hasil pencarian</string>
     <string name="pref_highlight_entry_title">Sorot token saat disentuh</string>
     <string name="pref_highlight_entry_summary">Jadikan token untuk lebih mudah dibedakan satu sama lain dengan menyorotnya saat disentuh</string>
     <string name="pref_copy_on_tap_title">Salin token saat disentuh</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 27a90dc5..6108b6d8 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Nome gruppo</string>
     <string name="preference_manage_groups">Modifica gruppi</string>
     <string name="preference_manage_groups_summary">Gestisci ed elimina i tuoi gruppi qui</string>
-    <string name="pref_search_name_title">Cerca nei nomi degli account</string>
-    <string name="pref_search_name_summary">Includi il nome dell\'account nei risultati di ricerca</string>
     <string name="pref_highlight_entry_title">Evidenzia i token al tocco</string>
     <string name="pref_highlight_entry_summary">Rendi i token più facili da distinguere, evidenziandoli temporaneamente quando vengono toccati</string>
     <string name="pref_copy_on_tap_title">Copia i token con un tocco</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 7c2b6456..e3aaaa22 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -207,8 +207,6 @@
     <string name="group_name_hint">グループ名</string>
     <string name="preference_manage_groups">グループを編集</string>
     <string name="preference_manage_groups_summary">ここでグループの管理や削除ができます</string>
-    <string name="pref_search_name_title">アカウント名で検索</string>
-    <string name="pref_search_name_summary">検索結果にアカウント名が一致するものを含める</string>
     <string name="pref_highlight_entry_title">タップ時にトークンを強調表示する</string>
     <string name="pref_highlight_entry_summary">タップ時に一時的に強調表示することで、トークンが互いに区別しやすくなります。</string>
     <string name="pref_copy_on_tap_title">タップ時にトークンをコピー</string>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 7af84588..94cb6e1e 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -118,8 +118,6 @@
     <string name="group_name_hint">ಗುಂಪಿನ ಹೆಸರು</string>
     <string name="preference_manage_groups">ಗುಂಪುಗಳನ್ನು ಸಂಪಾದಿಸು</string>
     <string name="preference_manage_groups_summary">ಇಲ್ಲಿ ನಿಮ್ಮ ಗುಂಪುಗಳನ್ನು ನಿರ್ವಹಿಸು ಮತ್ತು ಅಳಿಸು</string>
-    <string name="pref_search_name_title">ಖಾತೆಯ ಹೆಸರುಗಳಲ್ಲಿ ಹುಡುಕು</string>
-    <string name="pref_search_name_summary">ಹುಡುಕಾಟ ಫಲಿತಂಶದಲ್ಲಿ ಖಾತೆಯ ಹೆಸರನ್ನು ಒಳಗೊಂಡಿಸು</string>
     <string name="selected">ಆಯ್ಕೆ ಮಾಡಿರುವುದು</string>
     <string name="dark_theme_title">ಗಾಢ ಥೀಮ್</string>
     <string name="light_theme_title">ತಿಳಿ ಥೀಮ್</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 19af3049..931a7315 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Groepsnaam</string>
     <string name="preference_manage_groups">Groepen bewerken</string>
     <string name="preference_manage_groups_summary">Beheer en verwijder hier je groepen</string>
-    <string name="pref_search_name_title">Zoek in accountnamen</string>
-    <string name="pref_search_name_summary">Neem accountnaamovereenkomsten op in de zoekresultaten</string>
     <string name="pref_highlight_entry_title">Tokens markeren na aantikken</string>
     <string name="pref_highlight_entry_summary">Maak tokens makkelijker te onderscheiden van elkaar door ze tijdelijk te markeren wanneer ze worden aangeklikt</string>
     <string name="pref_copy_on_tap_title">Tokens kopiëren wanneer aangeklikt</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index df40058c..666f02c5 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -217,8 +217,6 @@
     <string name="group_name_hint">Nazwa grupy</string>
     <string name="preference_manage_groups">Edytuj grupy</string>
     <string name="preference_manage_groups_summary">Zarządzaj i usuwaj grupy tutaj</string>
-    <string name="pref_search_name_title">Przeszukaj nazwy kont</string>
-    <string name="pref_search_name_summary">Uwzględnij nazwę konta w wynikach wyszukiwania</string>
     <string name="pref_highlight_entry_title">Podświetl tokeny podczas kliknięcia</string>
     <string name="pref_highlight_entry_summary">Wyróżnij tokeny od siebie poprzez tymczasowe podświetlenie po ich kliknięciu</string>
     <string name="pref_copy_on_tap_title">Kopiuj tokeny podczas kliknięcia</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1b4e724d..84b68390 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Nome do grupo</string>
     <string name="preference_manage_groups">Editar grupos</string>
     <string name="preference_manage_groups_summary">Gerencie e delete seus grupos aqui</string>
-    <string name="pref_search_name_title">Procurar nos nomes de contas</string>
-    <string name="pref_search_name_summary">Inclue correspondências de nomes de contas no resultados de pesquisa</string>
     <string name="pref_highlight_entry_title">Destacar tokens quando tocados</string>
     <string name="pref_highlight_entry_summary">Torna tokens mais fáceis de distinguir dos outros destacando eles temporariamente quando tocados</string>
     <string name="pref_copy_on_tap_title">Copiar tokens quando tocados</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 21b8553c..dec4463f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -211,8 +211,6 @@
     <string name="group_name_hint">Nome do grupo</string>
     <string name="preference_manage_groups">Editar grupos</string>
     <string name="preference_manage_groups_summary">Gerenciar e excluir seus grupos aqui</string>
-    <string name="pref_search_name_title">Pesquisar nos nomes de conta</string>
-    <string name="pref_search_name_summary">Incluir nomes de conta correspondentes nos resultados da pesquisa</string>
     <string name="pref_highlight_entry_title">Destacar tokens quando tocados</string>
     <string name="pref_highlight_entry_summary">Faça com que os tokens sejam mais fáceis de distinguir um do outro destacando-os temporariamente ao tocá-los</string>
     <string name="pref_copy_on_tap_title">Copiar tokens quando tocados</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5d51899d..e2a62d7c 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -212,8 +212,6 @@
     <string name="group_name_hint">Numele grupului</string>
     <string name="preference_manage_groups">Editează grupuri</string>
     <string name="preference_manage_groups_summary">Gestionează și șterge grupurile tale aici</string>
-    <string name="pref_search_name_title">Căutați după numele conturilor</string>
-    <string name="pref_search_name_summary">Include potrivirea numelui de cont in rezultatele cautarii</string>
     <string name="pref_highlight_entry_title">Evidențiază simbolurile când apăsați</string>
     <string name="pref_highlight_entry_summary">Fă token-urile mai ușor să se distingă între ele prin evidențierea lor temporară atunci când sunt apăsate</string>
     <string name="pref_copy_on_tap_title">Copiați token-urile când apăsați</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 17b912b9..d0016a0d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -217,8 +217,6 @@
     <string name="group_name_hint">Название группы</string>
     <string name="preference_manage_groups">Редактировать группы</string>
     <string name="preference_manage_groups_summary">Редактирование и удаление ваших групп</string>
-    <string name="pref_search_name_title">Искать среди имён аккаунтов</string>
-    <string name="pref_search_name_summary">Включить совпадения имён учётных записей в результаты поиска</string>
     <string name="pref_highlight_entry_title">Выделять токены при нажатии</string>
     <string name="pref_highlight_entry_summary">Сделать токены более легко-различимыми, временно выделяя их при нажатии</string>
     <string name="pref_copy_on_tap_title">Копировать токены при нажатии</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 594cfc30..e1b9eadb 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -178,8 +178,6 @@
     <string name="group_name_hint">Grup adı</string>
     <string name="preference_manage_groups">Grupları düzenle</string>
     <string name="preference_manage_groups_summary">Gruplandırmalarınızı burada düzenleyebilir ve silebilirsiniz</string>
-    <string name="pref_search_name_title">Hesap adlarında ara</string>
-    <string name="pref_search_name_summary">Arama sonuçlarına hesap adı eşleşmelerini de ekle</string>
     <string name="pref_highlight_entry_title">Dokunulan kodları belirt</string>
     <string name="pref_highlight_entry_summary">Kodların birbirlerinden ayırt edilmelerini kolaylaştırmak için geçici olarak belirginleştir</string>
     <string name="selected">Seçilen</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8eddadf1..05441de5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -208,8 +208,6 @@
     <string name="group_name_hint">群组名称</string>
     <string name="preference_manage_groups">编辑群组</string>
     <string name="preference_manage_groups_summary">管理和删除您的群组</string>
-    <string name="pref_search_name_title">在帐户名称中搜索</string>
-    <string name="pref_search_name_summary">在搜索结果中包含匹配的帐户名称</string>
     <string name="pref_highlight_entry_title">点击时高亮令牌</string>
     <string name="pref_highlight_entry_summary">使令牌在点击后暂时高亮显示以便区分</string>
     <string name="pref_copy_on_tap_title">点击时复制令牌</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0e4910fc..9e7d7134 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -199,8 +199,6 @@
     <string name="group_name_hint">群組名稱</string>
     <string name="preference_manage_groups">編輯群組</string>
     <string name="preference_manage_groups_summary">管理和移除您的群組</string>
-    <string name="pref_search_name_title">在帳戶名稱中搜索</string>
-    <string name="pref_search_name_summary">在搜索結果中包含匹配的帳戶名稱</string>
     <string name="pref_highlight_entry_title">點擊時高亮令牌</string>
     <string name="pref_highlight_entry_summary">使令牌在點擊後暫時高亮顯示以便區分</string>
     <string name="pref_copy_on_tap_title">點擊時復制令牌</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8cc7c302..76a181f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -220,8 +220,6 @@
     <string name="group_name_hint">Group name</string>
     <string name="preference_manage_groups">Edit groups</string>
     <string name="preference_manage_groups_summary">Manage and delete your groups here</string>
-    <string name="pref_search_name_title">Search in account names</string>
-    <string name="pref_search_name_summary">Include account name matches in the search results</string>
     <string name="pref_highlight_entry_title">Highlight tokens when tapped</string>
     <string name="pref_highlight_entry_summary">Make tokens easier to distinguish from each other by temporarily highlighting them when tapped</string>
     <string name="pref_copy_on_tap_title">Copy tokens when tapped</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c38b8aea..91e20e7b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -52,12 +52,6 @@
     <PreferenceCategory
         android:title="@string/pref_general_group_title"
         app:iconSpaceReserved="false">
-        <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="pref_search_names"
-            android:title="@string/pref_search_name_title"
-            android:summary="@string/pref_search_name_summary"
-            app:iconSpaceReserved="false"/>
         <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_copy_on_tap"