yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

use standard book key for selected book in library

Browse source
This commit is contained in:
Nikolay Pultsin 2013-01-20 13:23:40 +04:00
parent a9d948322c
commit d4d37f45c9
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/org/geometerplus/android/fbreader/ShowLibraryAction.java
View file

@ -21,8 +21,8 @@ package org.geometerplus.android.fbreader;
import android.content.Intent; import android.content.Intent;
import org.geometerplus.fbreader.book.SerializerUtil;
import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.android.fbreader.library.LibraryActivity; import org.geometerplus.android.fbreader.library.LibraryActivity;
@ -33,10 +33,9 @@ class ShowLibraryAction extends FBAndroidAction {
@Override @Override
protected void run(Object ... params) { protected void run(Object ... params) {
final BookModel model = Reader.Model; final Intent intent = new Intent(BaseActivity.getApplicationContext(), LibraryActivity.class);
Intent intent = new Intent(BaseActivity.getApplicationContext(), LibraryActivity.class); if (Reader.Model != null) {
if (model != null && model.Book != null) { intent.putExtra(FBReader.BOOK_KEY, SerializerUtil.serialize(Reader.Model.Book));
intent.putExtra(LibraryActivity.SELECTED_BOOK_PATH_KEY, model.Book.File.getPath());
} }
OrientationUtil.startActivity(BaseActivity, intent); OrientationUtil.startActivity(BaseActivity, intent);
} }

12
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
View file

@ -46,8 +46,6 @@ import org.geometerplus.android.fbreader.tree.TreeActivity;
public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItemClickListener, View.OnCreateContextMenuListener, Library.ChangeListener { public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItemClickListener, View.OnCreateContextMenuListener, Library.ChangeListener {
static volatile boolean ourToBeKilled = false; static volatile boolean ourToBeKilled = false;
public static final String SELECTED_BOOK_PATH_KEY = "SelectedBookPath";
private BooksDatabase myDatabase; private BooksDatabase myDatabase;
private Library myLibrary; private Library myLibrary;
@ -67,14 +65,8 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
myLibrary.startBuild(); myLibrary.startBuild();
} }
final String selectedBookPath = getIntent().getStringExtra(SELECTED_BOOK_PATH_KEY); mySelectedBook =
mySelectedBook = null; SerializerUtil.deserializeBook(getIntent().getStringExtra(FBReader.BOOK_KEY));
if (selectedBookPath != null) {
final ZLFile file = ZLFile.createFileByPath(selectedBookPath);
if (file != null) {
mySelectedBook = Book.getByFile(file);
}
}
new LibraryTreeAdapter(this); new LibraryTreeAdapter(this);