From 4af5b5f6f21c28b718224690a6239d13f019f032 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Wed, 16 Aug 2023 22:01:58 +0200
Subject: [PATCH] Fix database migration and string trimming

Co-authored-by:  Yingwei Zheng <dtcxzyw@qq.com>
---
 .../newpipe/database/DatabaseMigrationTest.kt | 23 +++++++++++--------
 .../schabi/newpipe/database/Migrations.java   |  4 ++--
 .../fragments/list/search/SearchFragment.java | 17 ++++----------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt b/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt
index cd048ac44..c0c608a58 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt
+++ b/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt
@@ -111,8 +111,10 @@ class DatabaseMigrationTest {
         )
 
         testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME, Migrations.DB_VER_6,
-            true, Migrations.MIGRATION_5_6
+            AppDatabase.DATABASE_NAME,
+            Migrations.DB_VER_8,
+            true,
+            Migrations.MIGRATION_7_8
         )
 
         val migratedDatabaseV3 = getMigratedDatabase()
@@ -150,10 +152,13 @@ class DatabaseMigrationTest {
     }
 
     @Test
-    fun migrateDatabaseFrom5to6() {
-        val databaseInV5 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_5)
+    fun migrateDatabaseFrom7to8() {
+        val databaseInV7 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_7)
 
-        databaseInV5.run {
+        val defaultSearch1 = " abc "
+        val defaultSearch2 = " abc"
+
+        databaseInV7.run {
             insert(
                 "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
@@ -186,12 +191,12 @@ class DatabaseMigrationTest {
         }
 
         testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME, Migrations.DB_VER_6,
-            true, Migrations.MIGRATION_5_6
+            AppDatabase.DATABASE_NAME, Migrations.DB_VER_8,
+            true, Migrations.MIGRATION_7_8
         )
 
-        val migratedDatabaseV6 = getMigratedDatabase()
-        val listFromDB = migratedDatabaseV6.searchHistoryDAO().all.blockingFirst()
+        val migratedDatabaseV8 = getMigratedDatabase()
+        val listFromDB = migratedDatabaseV8.searchHistoryDAO().all.blockingFirst()
 
         assertEquals(2, listFromDB.size)
         assertEquals("abc", listFromDB[0].search)
diff --git a/app/src/main/java/org/schabi/newpipe/database/Migrations.java b/app/src/main/java/org/schabi/newpipe/database/Migrations.java
index 65c5626a5..4b1a34dd6 100644
--- a/app/src/main/java/org/schabi/newpipe/database/Migrations.java
+++ b/app/src/main/java/org/schabi/newpipe/database/Migrations.java
@@ -239,8 +239,8 @@ public final class Migrations {
     public static final Migration MIGRATION_7_8 = new Migration(DB_VER_7, DB_VER_8) {
         @Override
         public void migrate(@NonNull final SupportSQLiteDatabase database) {
-            database.execSQL("DELETE FROM search_history WHERE id NOT IN (SELECT id FROM "
-                    + "(SELECT id FROM search_history GROUP BY trim(search), service_id) tmp)");
+            database.execSQL("DELETE FROM search_history WHERE id NOT IN (SELECT id FROM (SELECT "
+                    + "MIN(id) as id FROM search_history GROUP BY trim(search), service_id ) tmp)");
             database.execSQL("UPDATE search_history SET search = trim(search)");
         }
     };
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 87c48b69c..df4a47bc5 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
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.fragments.list.search;
 
 import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
+import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
 import static java.util.Arrays.asList;
@@ -398,7 +399,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     @Override
     public void reloadContent() {
         if (!TextUtils.isEmpty(searchString) || (searchEditText != null
-                && TextUtils.getTrimmedLength(searchEditText.getText()) > 0)) {
+                && !isBlank(searchEditText.getText().toString()))) {
             search(!TextUtils.isEmpty(searchString)
                     ? searchString
                     : searchEditText.getText().toString(), this.contentFilter, "");
@@ -496,7 +497,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         searchEditText.setText(searchString);
 
         if (TextUtils.isEmpty(searchString)
-                || TextUtils.getTrimmedLength(searchEditText.getText()) == 0) {
+                || isBlank(searchEditText.getText().toString())) {
             searchToolbarContainer.setTranslationX(100);
             searchToolbarContainer.setAlpha(0.0f);
             searchToolbarContainer.setVisibility(View.VISIBLE);
@@ -520,7 +521,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             if (DEBUG) {
                 Log.d(TAG, "onClick() called with: v = [" + v + "]");
             }
-            if (TextUtils.getTrimmedLength(searchEditText.getText()) == 0) {
+            if (isBlank(searchEditText.getText().toString())) {
                 NavigationHelper.gotoMainFragment(getFM());
                 return;
             }
@@ -582,12 +583,9 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             searchEditText.removeTextChangedListener(textWatcher);
         }
         textWatcher = new TextWatcher() {
-            private boolean isPastedText = false;
-
             @Override
             public void beforeTextChanged(final CharSequence s, final int start,
                                           final int count, final int after) {
-                isPastedText = TextUtils.isEmpty(s) && after > 1;
             }
 
             @Override
@@ -604,11 +602,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
                 final String newText = searchEditText.getText().toString().trim();
                 suggestionPublisher.onNext(newText);
-
-                if (isPastedText) {
-                    // trim pasted text
-                    searchEditText.setText(newText);
-                }
             }
         };
         searchEditText.addTextChangedListener(textWatcher);
@@ -817,7 +810,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             Log.d(TAG, "search() called with: query = [" + theSearchString + "]");
             final String trimmedSearchString = theSearchString.trim();
             if (!trimmedSearchString.equals(theSearchString)) {
-                Log.d(TAG, "The precondition is not satisfied. "
+                Log.w(TAG, "The precondition is not satisfied. "
                         + "\"theSearchString\" is not allowed to have leading or trailing spaces");
             }
         }