Refactor database migration test and string trimming

Author: dtcxzyw

app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt

@@ -28,9 +28,6 @@ class DatabaseMigrationTest {
 
         private const val DEFAULT_SECOND_SERVICE_ID = 1
         private const val DEFAULT_SECOND_URL = "https://www.youtube.com/watch?v=ncQU6iBn5Fc"
-
-        private const val DEFAULT_SEARCH1 = " abc "
-        private const val DEFAULT_SEARCH2 = " abc"
     }
 
     @get:Rule
@@ -163,28 +160,28 @@ class DatabaseMigrationTest {
                 "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", DEFAULT_SERVICE_ID)
-                    put("search", DEFAULT_SEARCH1)
+                    put("search", defaultSearch1)
                 }
             )
             insert(
                 "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", DEFAULT_SERVICE_ID)
-                    put("search", DEFAULT_SEARCH2)
+                    put("search", defaultSearch2)
                 }
             )
             insert(
                 "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", DEFAULT_SECOND_SERVICE_ID)
-                    put("search", DEFAULT_SEARCH1)
+                    put("search", defaultSearch1)
                 }
             )
             insert(
                 "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", DEFAULT_SECOND_SERVICE_ID)
-                    put("search", DEFAULT_SEARCH2)
+                    put("search", defaultSearch2)
                 }
             )
             close()

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -385,9 +385,8 @@ public void readFrom(@NonNull final Queue<Object> savedObjects) throws Exception
 
     @Override
     public void onSaveInstanceState(@NonNull final Bundle bundle) {
-        searchEditText.setText(searchEditText.getText().toString().trim());
         searchString = searchEditText != null
-                ? searchEditText.getText().toString()
+                ? getSearchEditString().trim()
                 : searchString;
         super.onSaveInstanceState(bundle);
     }
@@ -399,10 +398,10 @@ public void onSaveInstanceState(@NonNull final Bundle bundle) {
     @Override
     public void reloadContent() {
         if (!TextUtils.isEmpty(searchString) || (searchEditText != null
-                && !isBlank(searchEditText.getText().toString()))) {
+                && !isSearchEditBlank())) {
             search(!TextUtils.isEmpty(searchString)
                     ? searchString
-                    : searchEditText.getText().toString(), this.contentFilter, "");
+                    : getSearchEditString(), this.contentFilter, "");
         } else {
             if (searchEditText != null) {
                 searchEditText.setText("");
@@ -497,7 +496,7 @@ private void showSearchOnStart() {
         searchEditText.setText(searchString);
 
         if (TextUtils.isEmpty(searchString)
-                || isBlank(searchEditText.getText().toString())) {
+                || isSearchEditBlank()) {
             searchToolbarContainer.setTranslationX(100);
             searchToolbarContainer.setAlpha(0.0f);
             searchToolbarContainer.setVisibility(View.VISIBLE);
@@ -521,7 +520,7 @@ private void initSearchListeners() {
             if (DEBUG) {
                 Log.d(TAG, "onClick() called with: v = [" + v + "]");
             }
-            if (isBlank(searchEditText.getText().toString())) {
+            if (isSearchEditBlank()) {
                 NavigationHelper.gotoMainFragment(getFM());
                 return;
             }
@@ -600,7 +599,7 @@ public void afterTextChanged(final Editable s) {
                     s.removeSpan(span);
                 }
 
-                final String newText = searchEditText.getText().toString().trim();
+                final String newText = getSearchEditString().trim();
                 suggestionPublisher.onNext(newText);
             }
         };
@@ -616,8 +615,8 @@ public void afterTextChanged(final Editable s) {
                     } else if (event != null
                             && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
                             || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
-                        searchEditText.setText(searchEditText.getText().toString().trim());
-                        search(searchEditText.getText().toString(), new String[0], "");
+                        searchEditText.setText(getSearchEditString().trim());
+                        search(getSearchEditString(), new String[0], "");
                         return true;
                     }
                     return false;
@@ -692,7 +691,7 @@ private void showDeleteSuggestionDialog(final SuggestionItem item) {
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(
                                     howManyDeleted -> suggestionPublisher
-                                            .onNext(searchEditText.getText().toString()),
+                                            .onNext(getSearchEditString()),
                                     throwable -> showSnackBarError(new ErrorInfo(throwable,
                                             UserAction.DELETE_FROM_HISTORY,
                                             "Deleting item failed")));
@@ -942,6 +941,14 @@ private void setQuery(final int theServiceId,
         sortFilter = theSortFilter;
     }
 
+    private String getSearchEditString() {
+        return searchEditText.getText().toString();
+    }
+
+    private Boolean isSearchEditBlank() {
+        return isBlank(getSearchEditString());
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Suggestion Results
     //////////////////////////////////////////////////////////////////////////*/
@@ -1087,7 +1094,7 @@ public void onSuggestionItemSwiped(@NonNull final RecyclerView.ViewHolder viewHo
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         howManyDeleted -> suggestionPublisher
-                                .onNext(searchEditText.getText().toString()),
+                                .onNext(getSearchEditString()),
                         throwable -> showSnackBarError(new ErrorInfo(throwable,
                                 UserAction.DELETE_FROM_HISTORY, "Deleting item failed")));
         disposables.add(onDelete);