diff options
| author | Andrew Dolgov <[email protected]> | 2015-06-09 18:10:24 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-06-09 18:10:24 +0300 |
| commit | c1231498cfc5a37e4b872953eccaf2b99c7ec34e (patch) | |
| tree | c4952d22b2ed0659a60b549861ea59952d0d9b14 /org.fox.ttcomics | |
| parent | b0c6dc1089dd1f14e27ffc403cb28a21222e7c7b (diff) | |
remove some rar remnants
Diffstat (limited to 'org.fox.ttcomics')
| -rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java index 2b3c2c5..6060c09 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java @@ -299,11 +299,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { selection = "path = ?"; selectionArgs = new String[] { baseDir }; } - - if (!m_prefs.getBoolean("enable_rar", false)) { - selection += " AND (UPPER(filename) NOT LIKE '%.CBR' AND UPPER(filename) NOT LIKE '%.RAR')"; - } - + return m_activity.getReadableDb().query("comics_cache", new String[] { BaseColumns._ID, "filename", "path", "(SELECT path || '/' || filename FROM comics_cache AS t2 WHERE t2.path = comics_cache.path || '/' || comics_cache.filename AND filename != '' ORDER BY filename LIMIT 1) AS firstchild" }, selection, selectionArgs, null, null, "size != " + SIZE_DIR + ", filename, size = " + SIZE_DIR + ", filename"); @@ -347,7 +343,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { if (archive.isDirectory()) { m_activity.setSize(filePath, SIZE_DIR); - } else if (archive.getName().toLowerCase().matches(".*\\.(cbz|zip|cbr|rar)") && isAdded() && m_activity != null && + } else if (archive.getName().toLowerCase().matches(".*\\.(cbz|zip)") && isAdded() && m_activity != null && m_activity.getWritableDb() != null && m_activity.getWritableDb().isOpen()) { try { int size = m_activity.getSize(filePath); |