feat(history): implement functional infinite search history preference (#11726)

Author: yihang-lab

NewPipeExtractor

@@ -0,0 +1 @@
+Subproject commit 3af73262cc60cf555fd5f1d691f6c58e2db38ef5

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java

@@ -49,4 +49,11 @@ public interface SearchHistoryDAO extends HistoryDAO<SearchHistoryEntry> {
     @Query("SELECT " + SEARCH + " FROM " + TABLE_NAME + " WHERE " + SEARCH + " LIKE :query || '%'"
             + " GROUP BY " + SEARCH + ORDER_BY_MAX_CREATION_DATE + " LIMIT :limit")
     Flowable<List<String>> getSimilarEntries(String query, int limit);
+
+
+    @Query("SELECT * FROM " + TABLE_NAME + ORDER_BY_CREATION_DATE)
+    List<SearchHistoryEntry> getAllEntries();
+
+    @androidx.room.Delete
+    void delete(SearchHistoryEntry entry);
 }

app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java

@@ -203,11 +203,27 @@ public Maybe<Long> onSearched(final int serviceId, final String search) {
                 latestEntry.setCreationDate(currentTime);
                 return (long) searchHistoryTable.update(latestEntry);
             } else {
-                return searchHistoryTable.insert(newEntry);
+                final long insertedId = searchHistoryTable.insert(newEntry);
+
+                //New
+                final boolean infiniteEnabled = sharedPreferences.getBoolean(
+                        "infinite_search_history", false
+                );
+                if (!infiniteEnabled) {
+                    final List<SearchHistoryEntry> allEntries = searchHistoryTable.getAllEntries();
+                    final int maxSize = 25;
+                    if (allEntries.size() > maxSize) {
+                        for (int i = maxSize; i < allEntries.size(); i++) {
+                            searchHistoryTable.delete(allEntries.get(i));
+                        }
+                    }
+                }
+                return insertedId;
             }
         })).subscribeOn(Schedulers.io());
     }
 
+
     public Single<Integer> deleteSearchHistory(final String search) {
         return Single.fromCallable(() -> searchHistoryTable.deleteAllWhereQuery(search))
                 .subscribeOn(Schedulers.io());
@@ -218,12 +234,22 @@ public Single<Integer> deleteCompleteSearchHistory() {
                 .subscribeOn(Schedulers.io());
     }
 
-    public Flowable<List<String>> getRelatedSearches(final String query,
-                                                     final int similarQueryLimit,
-                                                     final int uniqueQueryLimit) {
+    public Flowable<List<String>> getRelatedSearches(
+            final String query,
+            final int similarQueryLimit,
+            final int uniqueQueryLimit
+    ) {
+        final boolean infiniteEnabled = sharedPreferences.getBoolean(
+                "infinite_search_history", false
+        );
+        final int largeLimit = 100000;
+
+        final int sLimit = infiniteEnabled ? largeLimit : similarQueryLimit;
+        final int uLimit = infiniteEnabled ? largeLimit : uniqueQueryLimit;
+
         return query.length() > 0
-                ? searchHistoryTable.getSimilarEntries(query, similarQueryLimit)
-                : searchHistoryTable.getUniqueEntries(uniqueQueryLimit);
+                ? searchHistoryTable.getSimilarEntries(query, sLimit)
+                : searchHistoryTable.getUniqueEntries(uLimit);
     }
 
     private boolean isSearchHistoryEnabled() {

app/src/main/res/values/strings.xml

@@ -882,4 +882,7 @@
     <string name="youtube_player_http_403">HTTP error 403 received from server while playing, likely caused by an IP ban or streaming URL deobfuscation issues</string>
     <string name="sign_in_confirm_not_bot_error">%1$s refused to provide data, asking for a login to confirm the requester is not a bot.\n\nYour IP might have been temporarily banned by %1$s, you can wait some time or switch to a different IP (for example by turning on/off a VPN, or by switching from WiFi to mobile data).</string>
     <string name="unsupported_content_in_country">This content is not available for the currently selected content country.\n\nChange your selection from \"Settings > Content > Default content country\".</string>
+    <string name="pref_infinite_search_history_title">Enable Infinite Search History</string>
+    <string name="pref_infinite_search_history_summary">Allow search history to load infinitely instead of being limited to 25 entries.</string>
+    <string name="infinite_search_history_key">infinite_search_history</string>
 </resources>

app/src/main/res/xml/history_settings.xml

@@ -38,6 +38,16 @@
         app:singleLineTitle="false"
         app:iconSpaceReserved="false" />
 
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="@string/infinite_search_history_key"
+        android:title="@string/pref_infinite_search_history_title"
+        android:summary="@string/pref_infinite_search_history_summary"
+        app:singleLineTitle="false"
+        app:iconSpaceReserved="false" />
+
+
     <PreferenceCategory
         android:layout="@layout/settings_category_header_layout"
         android:title="@string/settings_category_clear_data_title"

settings.gradle

@@ -3,9 +3,9 @@ include ':app'
 // Use a local copy of NewPipe Extractor by uncommenting the lines below.
 // We assume, that NewPipe and NewPipe Extractor have the same parent directory.
 // If this is not the case, please change the path in includeBuild().
-
-//includeBuild('../NewPipeExtractor') {
-//    dependencySubstitution {
-//        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
-//    }
-//}
+//
+includeBuild('../NewPipeExtractor') {
+    dependencySubstitution {
+        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
+    }
+}