From 9b1861417c6af51a636424384649d456700c790d Mon Sep 17 00:00:00 2001
From: Zhiheng Xu <xeric.2002@gmail.com>
Date: Sat, 22 May 2021 21:32:36 -0400
Subject: [PATCH 1/3] Add formatting removal on paste for search

Closes #5912
---
 .../newpipe/fragments/list/search/SearchFragment.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index b52aaf2f8..282367ffc 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -9,6 +9,7 @@ import android.text.Editable;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.style.CharacterStyle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -588,6 +589,12 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
             @Override
             public void afterTextChanged(final Editable s) {
+                final CharacterStyle[] toBeRemovedSpans = s.getSpans(
+                        0, s.length(), CharacterStyle.class
+                );
+                for (final CharacterStyle toBeRemovedSpan : toBeRemovedSpans) {
+                    s.removeSpan(toBeRemovedSpan);
+                }
                 final String newText = searchEditText.getText().toString();
                 suggestionPublisher.onNext(newText);
             }

From 8f4c6fb6ac414a703a80ff64d4f6c9b4ce9aed76 Mon Sep 17 00:00:00 2001
From: Zhiheng Xu <xeric.2002@gmail.com>
Date: Sun, 23 May 2021 10:44:17 -0400
Subject: [PATCH 2/3] Add comment

---
 .../schabi/newpipe/fragments/list/search/SearchFragment.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 282367ffc..86282362a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -589,12 +589,14 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
             @Override
             public void afterTextChanged(final Editable s) {
+                // Remove rich text formatting
                 final CharacterStyle[] toBeRemovedSpans = s.getSpans(
                         0, s.length(), CharacterStyle.class
                 );
                 for (final CharacterStyle toBeRemovedSpan : toBeRemovedSpans) {
                     s.removeSpan(toBeRemovedSpan);
                 }
+                
                 final String newText = searchEditText.getText().toString();
                 suggestionPublisher.onNext(newText);
             }

From ea1b910d7ea7359cd7c584477a1a8ec76ddee0de Mon Sep 17 00:00:00 2001
From: Zhiheng Xu <xeric.2002@gmail.com>
Date: Sun, 23 May 2021 10:50:18 -0400
Subject: [PATCH 3/3] Simplify code

---
 .../newpipe/fragments/list/search/SearchFragment.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 86282362a..70fce1cb7 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -590,13 +590,10 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             @Override
             public void afterTextChanged(final Editable s) {
                 // Remove rich text formatting
-                final CharacterStyle[] toBeRemovedSpans = s.getSpans(
-                        0, s.length(), CharacterStyle.class
-                );
-                for (final CharacterStyle toBeRemovedSpan : toBeRemovedSpans) {
-                    s.removeSpan(toBeRemovedSpan);
+                for (final CharacterStyle span : s.getSpans(0, s.length(), CharacterStyle.class)) {
+                    s.removeSpan(span);
                 }
-                
+
                 final String newText = searchEditText.getText().toString();
                 suggestionPublisher.onNext(newText);
             }