wallabag/android-app
1
0
Fork 0
mirror of https://github.com/wallabag/android-app.git synced 2026-06-18 15:14:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #588 from wallabag/fix_duplicate_tag_crash

Browse Source 
Correctly process multiple tags with the same label in article filtering
This commit is contained in:
Strubbl
2017-06-29 19:14:54 +02:00
committed by GitHub
parent cb3bbd4f11 f7a233d455
commit 2dad2eec4a
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java
+11 -8
View File
@@ -16,6 +16,7 @@ import android.widget.Toast;
import org.greenrobot.greendao.query.LazyList;
import org.greenrobot.greendao.query.QueryBuilder;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -49,7 +50,7 @@ public class ArticleListFragment extends RecyclerViewListFragment<Article> {
private int listType;
private String tagLabel;
private Long tagID;
private List<Long> tagIDs;
private OnFragmentInteractionListener host;
@@ -144,15 +145,17 @@ public class ArticleListFragment extends RecyclerViewListFragment<Article> {
@Override
protected void resetContent() {
if(tagLabel != null) {
// TODO: check: can be non-unique?
Tag tag = tagDao.queryBuilder()
List<Tag> tags = tagDao.queryBuilder()
.where(TagDao.Properties.Label.eq(tagLabel))
.orderDesc(TagDao.Properties.Label)
.unique();
.list();
tagID = tag != null ? tag.getId() : null;
tagIDs = new ArrayList<>(tags.size());
for(Tag t: tags) {
tagIDs.add(t.getId());
}
} else {
tagID = null;
tagIDs = null;
}
super.resetContent();
@@ -173,10 +176,10 @@ public class ArticleListFragment extends RecyclerViewListFragment<Article> {
private QueryBuilder<Article> getQueryBuilder() {
QueryBuilder<Article> qb = articleDao.queryBuilder();
if(tagID != null) {
if(tagIDs != null && !tagIDs.isEmpty()) {
// TODO: try subquery
qb.join(ArticleTagsJoin.class, ArticleTagsJoinDao.Properties.ArticleId)
.where(ArticleTagsJoinDao.Properties.TagId.eq(tagID));
.where(ArticleTagsJoinDao.Properties.TagId.in(tagIDs));
}
switch(listType) {