Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Move latestEntry into SearchHistoryDao directly

Browse source 
The StreamHistoryDao one isn't used, so remove it and streamline the logic

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta 2025-11-17 14:40:38 +08:00
parent aaa99bd90d
commit 6e161ec896
3 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/schabi/newpipe/database/history/dao/HistoryDAO.kt
View file

@ -1,13 +0,0 @@
/*
* SPDX-FileCopyrightText: 2017 NewPipe contributors <https://newpipe.net>
* SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package org.schabi.newpipe.database.history.dao
import org.schabi.newpipe.database.BasicDAO
interface HistoryDAO<T> : BasicDAO<T> {
val latestEntry: T?
}

5
app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.kt
View file

@ -9,13 +9,14 @@ package org.schabi.newpipe.database.history.dao
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Query import androidx.room.Query
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import org.schabi.newpipe.database.BasicDAO
import org.schabi.newpipe.database.history.model.SearchHistoryEntry import org.schabi.newpipe.database.history.model.SearchHistoryEntry
@Dao @Dao
interface SearchHistoryDAO : HistoryDAO<SearchHistoryEntry> { interface SearchHistoryDAO : BasicDAO<SearchHistoryEntry> {
@get:Query("SELECT * FROM search_history WHERE id = (SELECT MAX(id) FROM search_history)") @get:Query("SELECT * FROM search_history WHERE id = (SELECT MAX(id) FROM search_history)")
override val latestEntry: SearchHistoryEntry? val latestEntry: SearchHistoryEntry?
@Query("DELETE FROM search_history") @Query("DELETE FROM search_history")
override fun deleteAll(): Int override fun deleteAll(): Int

6
app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.kt
View file

@ -10,15 +10,13 @@ import androidx.room.Dao
import androidx.room.Query import androidx.room.Query
import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RewriteQueriesToDropUnusedColumns
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import org.schabi.newpipe.database.BasicDAO
import org.schabi.newpipe.database.history.model.StreamHistoryEntity import org.schabi.newpipe.database.history.model.StreamHistoryEntity
import org.schabi.newpipe.database.history.model.StreamHistoryEntry import org.schabi.newpipe.database.history.model.StreamHistoryEntry
import org.schabi.newpipe.database.stream.StreamStatisticsEntry import org.schabi.newpipe.database.stream.StreamStatisticsEntry
@Dao @Dao
abstract class StreamHistoryDAO : HistoryDAO<StreamHistoryEntity> { abstract class StreamHistoryDAO : BasicDAO<StreamHistoryEntity> {
@get:Query("SELECT * FROM stream_history WHERE access_date = (SELECT MAX(access_date) FROM stream_history)")
abstract override val latestEntry: StreamHistoryEntity
@Query("SELECT * FROM stream_history") @Query("SELECT * FROM stream_history")
abstract override fun getAll(): Flowable<List<StreamHistoryEntity>> abstract override fun getAll(): Flowable<List<StreamHistoryEntity>>