Skip to content

Minor fixes for database #12816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stypox merged 3 commits into from
Nov 18, 2025
Merged

Minor fixes for database #12816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85bd7c3
HistoryDao: latestEntry can be null
theimpulson Nov 8, 2025
9702189
Move latestEntry into SearchHistoryDao directly
theimpulson Nov 17, 2025
93f03ba
Call checkpoint creation from an executor
theimpulson Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions app/src/main/java/org/schabi/newpipe/database/history/dao/HistoryDAO.kt
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ package org.schabi.newpipe.database.history.dao
import androidx.room.Dao
import androidx.room.Query
import io.reactivex.rxjava3.core.Flowable
import org.schabi.newpipe.database.BasicDAO
import org.schabi.newpipe.database.history.model.SearchHistoryEntry

@Dao
interface SearchHistoryDAO : HistoryDAO<SearchHistoryEntry> {
interface SearchHistoryDAO : BasicDAO<SearchHistoryEntry> {

@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")
override fun deleteAll(): Int
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ import androidx.room.Dao
import androidx.room.Query
import androidx.room.RewriteQueriesToDropUnusedColumns
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.StreamHistoryEntry
import org.schabi.newpipe.database.stream.StreamStatisticsEntry

@Dao
abstract class StreamHistoryDAO : HistoryDAO<StreamHistoryEntity> {

@get:Query("SELECT * FROM stream_history WHERE access_date = (SELECT MAX(access_date) FROM stream_history)")
abstract override val latestEntry: StreamHistoryEntity
abstract class StreamHistoryDAO : BasicDAO<StreamHistoryEntity> {

@Query("SELECT * FROM stream_history")
abstract override fun getAll(): Flowable<List<StreamHistoryEntity>>
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import java.util.Date;
import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

public class BackupRestoreSettingsFragment extends BasePreferenceFragment {

Expand Down Expand Up @@ -155,9 +157,9 @@ private void requestImportPathResult(final ActivityResult result) {
}

private void exportDatabase(final StoredFileHelper file, final Uri exportDataUri) {
try {
try (ExecutorService executor = Executors.newSingleThreadExecutor()) {
//checkpoint before export
NewPipeDatabase.checkpoint();
executor.submit(NewPipeDatabase::checkpoint).get();

final SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(requireContext());
Expand Down