From d4d37f45c935b81182bb7d2299fc94479e9856bc Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 20 Jan 2013 13:23:40 +0400 Subject: [PATCH] use standard book key for selected book in library --- .../android/fbreader/ShowLibraryAction.java | 9 ++++----- .../android/fbreader/library/LibraryActivity.java | 12 ++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowLibraryAction.java index f8ba07870..ad5869c28 100644 --- a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java +++ b/src/org/geometerplus/android/fbreader/ShowLibraryAction.java @@ -21,8 +21,8 @@ package org.geometerplus.android.fbreader; import android.content.Intent; +import org.geometerplus.fbreader.book.SerializerUtil; import org.geometerplus.fbreader.fbreader.FBReaderApp; -import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.android.fbreader.library.LibraryActivity; @@ -33,10 +33,9 @@ class ShowLibraryAction extends FBAndroidAction { @Override protected void run(Object ... params) { - final BookModel model = Reader.Model; - Intent intent = new Intent(BaseActivity.getApplicationContext(), LibraryActivity.class); - if (model != null && model.Book != null) { - intent.putExtra(LibraryActivity.SELECTED_BOOK_PATH_KEY, model.Book.File.getPath()); + final Intent intent = new Intent(BaseActivity.getApplicationContext(), LibraryActivity.class); + if (Reader.Model != null) { + intent.putExtra(FBReader.BOOK_KEY, SerializerUtil.serialize(Reader.Model.Book)); } OrientationUtil.startActivity(BaseActivity, intent); } diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java index 83b8a1576..6a6dbe499 100644 --- a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java @@ -46,8 +46,6 @@ import org.geometerplus.android.fbreader.tree.TreeActivity; public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItemClickListener, View.OnCreateContextMenuListener, Library.ChangeListener { static volatile boolean ourToBeKilled = false; - public static final String SELECTED_BOOK_PATH_KEY = "SelectedBookPath"; - private BooksDatabase myDatabase; private Library myLibrary; @@ -67,14 +65,8 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem myLibrary.startBuild(); } - final String selectedBookPath = getIntent().getStringExtra(SELECTED_BOOK_PATH_KEY); - mySelectedBook = null; - if (selectedBookPath != null) { - final ZLFile file = ZLFile.createFileByPath(selectedBookPath); - if (file != null) { - mySelectedBook = Book.getByFile(file); - } - } + mySelectedBook = + SerializerUtil.deserializeBook(getIntent().getStringExtra(FBReader.BOOK_KEY)); new LibraryTreeAdapter(this);