diff --git a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java index c72a95526..b056f87dc 100644 --- a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java +++ b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java @@ -862,42 +862,6 @@ public final class SQLiteBooksDatabase extends BooksDatabase { myStorePositionStatement.execute(); } - private SQLiteStatement myInsertIntoBookListStatement; - protected boolean insertIntoBookList(long bookId) { - if (myInsertIntoBookListStatement == null) { - myInsertIntoBookListStatement = myDatabase.compileStatement( - "INSERT OR IGNORE INTO BookList(book_id) VALUES (?)" - ); - } - myInsertIntoBookListStatement.bindLong(1, bookId); - myInsertIntoBookListStatement.execute(); - return true; - } - - private SQLiteStatement myDeleteFromBookListStatement; - protected boolean deleteFromBookList(long bookId) { - if (myDeleteFromBookListStatement == null) { - myDeleteFromBookListStatement = myDatabase.compileStatement( - "DELETE FROM BookList WHERE book_id = ?" - ); - } - myDeleteFromBookListStatement.bindLong(1, bookId); - myDeleteFromBookListStatement.execute(); - deleteVisitedHyperlinks(bookId); - return true; - } - - private SQLiteStatement myCheckBookListStatement; - protected boolean checkBookList(long bookId) { - if (myCheckBookListStatement == null) { - myCheckBookListStatement = myDatabase.compileStatement( - "SELECT COUNT(*) FROM BookList WHERE book_id = ?" - ); - } - myCheckBookListStatement.bindLong(1, bookId); - return myCheckBookListStatement.simpleQueryForLong() > 0; - } - private SQLiteStatement myDeleteVisitedHyperlinksStatement; private void deleteVisitedHyperlinks(long bookId) { if (myDeleteVisitedHyperlinksStatement == null) { diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java index 33a638ab6..30f404836 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java @@ -337,14 +337,12 @@ public final class FBReaderApp extends ZLApplication { } Book book = Book.getByFile(file); if (book != null) { - book.insertIntoBookList(); return book; } if (file.isArchive()) { for (ZLFile child : file.children()) { book = Book.getByFile(child); if (book != null) { - book.insertIntoBookList(); return book; } } diff --git a/src/org/geometerplus/fbreader/library/Book.java b/src/org/geometerplus/fbreader/library/Book.java index 5e63dbf63..84e171fbf 100644 --- a/src/org/geometerplus/fbreader/library/Book.java +++ b/src/org/geometerplus/fbreader/library/Book.java @@ -478,12 +478,6 @@ public class Book { } } - public void insertIntoBookList() { - if (myId != -1) { - BooksDatabase.Instance().insertIntoBookList(myId); - } - } - public String getContentHashCode() { InputStream stream = null; diff --git a/src/org/geometerplus/fbreader/library/BooksDatabase.java b/src/org/geometerplus/fbreader/library/BooksDatabase.java index 2be9bb965..b7fc4ba23 100644 --- a/src/org/geometerplus/fbreader/library/BooksDatabase.java +++ b/src/org/geometerplus/fbreader/library/BooksDatabase.java @@ -104,10 +104,6 @@ public abstract class BooksDatabase { protected abstract ZLTextPosition getStoredPosition(long bookId); protected abstract void storePosition(long bookId, ZLTextPosition position); - protected abstract boolean insertIntoBookList(long bookId); - protected abstract boolean deleteFromBookList(long bookId); - protected abstract boolean checkBookList(long bookId); - protected abstract Collection loadVisitedHyperlinks(long bookId); protected abstract void addVisitedHyperlink(long bookId, String hyperlinkId); } diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java index 045311cf7..c6d009c2f 100644 --- a/src/org/geometerplus/fbreader/library/Library.java +++ b/src/org/geometerplus/fbreader/library/Library.java @@ -396,7 +396,6 @@ public final class Library { physicalFiles.add(file); } if (file != book.File && file != null && file.getPath().endsWith(".epub")) { - myDatabase.deleteFromBookList(book.getId()); continue; } if (book.File.exists()) { @@ -633,7 +632,6 @@ public final class Library { getFirstLevelTree(ROOT_FAVORITES).removeBook(book, false); myRootTree.removeBook(book, true); - myDatabase.deleteFromBookList(book.getId()); if ((removeMode & REMOVE_FROM_DISK) != 0) { book.File.getPhysicalFile().delete(); }