Skip to content

Use creation date instead of article ID for sorting #1161

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
Strubbl merged 1 commit into from
Jun 4, 2025
Merged

Use creation date instead of article ID for sorting #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/main/java/fr/gaulupeau/apps/Poche/service/workers/ArticleImagesFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void fetchImages(ActionRequest actionRequest) {
QueryBuilder<Article> queryBuilder = articleDao.queryBuilder()
.where(ArticleDao.Properties.ArticleId.isNotNull())
.where(ArticleDao.Properties.ImagesDownloaded.eq(false))
.orderAsc(ArticleDao.Properties.ArticleId);
.orderAsc(ArticleDao.Properties.CreationDate, ArticleDao.Properties.ArticleId);

int totalNumber = (int) queryBuilder.count();
Log.d(TAG, "fetchImages() total number: " + totalNumber);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/fr/gaulupeau/apps/Poche/service/workers/DeletedArticleSweeper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ private void performSweep(ArticlesChangedEvent event, ProgressListener progressL

QueryBuilder<Article> queryBuilder = articleDao.queryBuilder()
.where(ArticleDao.Properties.ArticleId.isNotNull())
.orderDesc(ArticleDao.Properties.ArticleId).limit(dbQuerySize);
.orderDesc(ArticleDao.Properties.CreationDate, ArticleDao.Properties.ArticleId)
.limit(dbQuerySize);

List<Long> articlesToDelete = new ArrayList<>();

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ private QueryBuilder<Article> getQueryBuilder() {

switch (sortOrder) {
case ASC:
qb.orderAsc(ArticleDao.Properties.ArticleId);
qb.orderAsc(ArticleDao.Properties.CreationDate, ArticleDao.Properties.ArticleId);
break;

case DESC:
qb.orderDesc(ArticleDao.Properties.ArticleId);
qb.orderDesc(ArticleDao.Properties.CreationDate, ArticleDao.Properties.ArticleId);
break;

default:
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,14 +1340,15 @@ private Long getAdjacentArticle(boolean previous) {
QueryBuilder<Article> qb = articleDao.queryBuilder()
.where(ArticleDao.Properties.ArticleId.isNotNull());

if (previous) qb.where(ArticleDao.Properties.ArticleId.gt(article.getArticleId()));
else qb.where(ArticleDao.Properties.ArticleId.lt(article.getArticleId()));
// possible problem: will skip articles with the same creation date
if (previous) qb.where(ArticleDao.Properties.CreationDate.gt(article.getCreationDate()));
else qb.where(ArticleDao.Properties.CreationDate.lt(article.getCreationDate()));

if (contextFavorites != null) qb.where(ArticleDao.Properties.Favorite.eq(contextFavorites));
if (contextArchived != null) qb.where(ArticleDao.Properties.Archive.eq(contextArchived));

if (previous) qb.orderAsc(ArticleDao.Properties.ArticleId);
else qb.orderDesc(ArticleDao.Properties.ArticleId);
if (previous) qb.orderAsc(ArticleDao.Properties.CreationDate);
else qb.orderDesc(ArticleDao.Properties.CreationDate);

List<Article> l = qb.limit(1).list();
if (!l.isEmpty()) {
Expand Down