yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 01:39:18 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.6-master

Browse source
This commit is contained in:
Nikolay Pultsin 2015-10-01 10:35:45 +01:00
commit af8f7537f5
4 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/TOCActivity.java
View file

@ -43,7 +43,7 @@ public class TOCActivity extends ListActivity {
private ZLTree<?> mySelectedItem; private ZLTree<?> mySelectedItem;
@Override @Override
public void onCreate(Bundle bundle) { protected void onCreate(Bundle bundle) {
super.onCreate(bundle); super.onCreate(bundle);
Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this)); Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this));

18
fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java
View file

@ -116,7 +116,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
@Override @Override
protected void onListItemClick(ListView listView, View view, int position, long rowId) { protected void onListItemClick(ListView listView, View view, int position, long rowId) {
final LibraryTree tree = (LibraryTree)getListAdapter().getItem(position); final LibraryTree tree = (LibraryTree)getTreeAdapter().getItem(position);
if (tree instanceof ExternalViewTree) { if (tree instanceof ExternalViewTree) {
runOrInstallExternalView(true); runOrInstallExternalView(true);
} else { } else {
@ -185,7 +185,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) { public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position; final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position;
final Book book = ((LibraryTree)getListAdapter().getItem(position)).getBook(); final Book book = ((LibraryTree)getTreeAdapter().getItem(position)).getBook();
if (book != null) { if (book != null) {
createBookContextMenu(menu, book); createBookContextMenu(menu, book);
} }
@ -223,7 +223,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
@Override @Override
public boolean onContextItemSelected(MenuItem item) { public boolean onContextItemSelected(MenuItem item) {
final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position; final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position;
final Book book = ((LibraryTree)getListAdapter().getItem(position)).getBook(); final Book book = ((LibraryTree)getTreeAdapter().getItem(position)).getBook();
if (book != null) { if (book != null) {
return onContextItemSelected(item.getItemId(), book); return onContextItemSelected(item.getItemId(), book);
} }
@ -256,7 +256,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
book.removeLabel(Book.FAVORITE_LABEL); book.removeLabel(Book.FAVORITE_LABEL);
myCollection.saveBook(book); myCollection.saveBook(book);
if (getCurrentTree().onBookEvent(BookEvent.Updated, book)) { if (getCurrentTree().onBookEvent(BookEvent.Updated, book)) {
getListAdapter().replaceAll(getCurrentTree().subtrees(), true); getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true);
} }
return true; return true;
case ContextItemId.MarkAsRead: case ContextItemId.MarkAsRead:
@ -276,7 +276,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
case ContextItemId.TryAgain: case ContextItemId.TryAgain:
syncAgain(book); syncAgain(book);
if (getCurrentTree().onBookEvent(BookEvent.Updated, book)) { if (getCurrentTree().onBookEvent(BookEvent.Updated, book)) {
getListAdapter().replaceAll(getCurrentTree().subtrees(), true); getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true);
} }
return true; return true;
} }
@ -360,7 +360,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
syncAgain(((BookTree)tree).Book); syncAgain(((BookTree)tree).Book);
} }
} }
getListAdapter().replaceAll(getCurrentTree().subtrees(), true); getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true);
return true; return true;
case OptionsItemId.DeleteAll: case OptionsItemId.DeleteAll:
{ {
@ -405,7 +405,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (getCurrentTree() instanceof FileTree) { if (getCurrentTree() instanceof FileTree) {
for (Book book : myBooks) { for (Book book : myBooks) {
getListAdapter().remove(new FileTree( getTreeAdapter().remove(new FileTree(
(FileTree)getCurrentTree(), (FileTree)getCurrentTree(),
BookUtil.fileByBook(book) BookUtil.fileByBook(book)
)); ));
@ -419,7 +419,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
myCollection.removeBook(book, true); myCollection.removeBook(book, true);
} }
if (doReplace) { if (doReplace) {
getListAdapter().replaceAll(getCurrentTree().subtrees(), true); getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true);
} }
} }
} }
@ -491,7 +491,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
public void onBookEvent(BookEvent event, Book book) { public void onBookEvent(BookEvent event, Book book) {
if (getCurrentTree().onBookEvent(event, book)) { if (getCurrentTree().onBookEvent(event, book)) {
getListAdapter().replaceAll(getCurrentTree().subtrees(), true); getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true);
} }
} }

8
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
View file

@ -302,7 +302,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity<NetworkTree> i
} }
final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position; final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position;
final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); final NetworkTree tree = (NetworkTree)getTreeAdapter().getItem(position);
if (tree != null) { if (tree != null) {
menu.setHeaderTitle(tree.getName()); menu.setHeaderTitle(tree.getName());
for (Action a : getContextMenuActions(tree)) { for (Action a : getContextMenuActions(tree)) {
@ -316,7 +316,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity<NetworkTree> i
@Override @Override
public boolean onContextItemSelected(MenuItem item) { public boolean onContextItemSelected(MenuItem item) {
final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position; final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position;
final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); final NetworkTree tree = (NetworkTree)getTreeAdapter().getItem(position);
if (tree != null) { if (tree != null) {
for (Action a : getContextMenuActions(tree)) { for (Action a : getContextMenuActions(tree)) {
if (a.Code == item.getItemId()) { if (a.Code == item.getItemId()) {
@ -334,7 +334,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity<NetworkTree> i
fillListClickList(); fillListClickList();
} }
final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); final NetworkTree tree = (NetworkTree)getTreeAdapter().getItem(position);
for (Action a : myListClickActions) { for (Action a : myListClickActions) {
if (a.isVisible(tree) && a.isEnabled(tree)) { if (a.isVisible(tree) && a.isEnabled(tree)) {
checkAndRun(a, tree); checkAndRun(a, tree);
@ -411,7 +411,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity<NetworkTree> i
switch (code) { switch (code) {
default: default:
updateLoadingProgress(); updateLoadingProgress();
getListAdapter().replaceAll(getCurrentTree().subtrees(), true); getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true);
break; break;
case InitializationFailed: case InitializationFailed:
showInitLibraryDialog((String)params[0]); showInitLibraryDialog((String)params[0]);

5
fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java
View file

@ -70,8 +70,7 @@ public abstract class TreeActivity<T extends FBTree> extends ListActivity {
super.onDestroy(); super.onDestroy();
} }
@Override public TreeAdapter getTreeAdapter() {
public TreeAdapter getListAdapter() {
return (TreeAdapter)super.getListAdapter(); return (TreeAdapter)super.getListAdapter();
} }
@ -173,7 +172,7 @@ public abstract class TreeActivity<T extends FBTree> extends ListActivity {
// not myCurrentKey = key // not myCurrentKey = key
// because key might be null // because key might be null
myCurrentKey = myCurrentTree.getUniqueKey(); myCurrentKey = myCurrentTree.getUniqueKey();
final TreeAdapter adapter = getListAdapter(); final TreeAdapter adapter = getTreeAdapter();
adapter.replaceAll(myCurrentTree.subtrees(), false); adapter.replaceAll(myCurrentTree.subtrees(), false);
setTitle(myCurrentTree.getTreeTitle()); setTitle(myCurrentTree.getTreeTitle());
final FBTree selectedTree = final FBTree selectedTree =