diff --git a/src/org/geometerplus/android/fbreader/network/AuthenticationDialog.java b/src/org/geometerplus/android/fbreader/network/AuthenticationDialog.java index d7520dd80..e26bed124 100644 --- a/src/org/geometerplus/android/fbreader/network/AuthenticationDialog.java +++ b/src/org/geometerplus/android/fbreader/network/AuthenticationDialog.java @@ -58,7 +58,7 @@ class AuthenticationDialog extends NetworkDialog { return; } final NetworkLibrary library = NetworkLibrary.Instance(); - library.invalidateAccountDependents(); + library.invalidateVisibility(); library.synchronize(); NetworkView.Instance().fireModelChanged(); if (message.what < 0) { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java index abc6cc1b1..c0906aa54 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java @@ -358,7 +358,7 @@ class NetworkBookActions extends NetworkTreeActions { } if (mgr.isAuthorised(true).Status == ZLBoolean3.B3_FALSE) { final NetworkLibrary library = NetworkLibrary.Instance(); - library.invalidateAccountDependents(); + library.invalidateVisibility(); library.synchronize(); } if (NetworkView.Instance().isInitialized()) { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java index 598378737..92f44af63 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java @@ -231,7 +231,7 @@ class NetworkCatalogActions extends NetworkTreeActions { } else { afterUpdateCatalog(errorMessage, myTree.ChildrenItems.size() == 0); final NetworkLibrary library = NetworkLibrary.Instance(); - library.invalidateAccountDependents(); + library.invalidateVisibility(); library.synchronize(); } if (NetworkView.Instance().isInitialized()) { @@ -358,7 +358,7 @@ class NetworkCatalogActions extends NetworkTreeActions { final Handler handler = new Handler() { public void handleMessage(Message message) { final NetworkLibrary library = NetworkLibrary.Instance(); - library.invalidateAccountDependents(); + library.invalidateVisibility(); library.synchronize(); if (NetworkView.Instance().isInitialized()) { NetworkView.Instance().fireModelChanged(); diff --git a/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java b/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java index 8dfff3e84..ec216c8e6 100644 --- a/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java +++ b/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java @@ -65,7 +65,7 @@ class RegisterUserDialog extends NetworkDialog { final Handler handler = new Handler() { public void handleMessage(Message message) { final NetworkLibrary library = NetworkLibrary.Instance(); - library.invalidateAccountDependents(); + library.invalidateVisibility(); library.synchronize(); if (NetworkView.Instance().isInitialized()) { NetworkView.Instance().fireModelChanged(); diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java index d8685943c..46082db31 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java +++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java @@ -49,7 +49,7 @@ public class NetworkLibrary { private final RootTree myRootTree = new RootTree(); private boolean myUpdateChildren = true; - private boolean myUpdateAccountDependents; + private boolean myUpdateVisibility; private static class LinksComparator implements Comparator { public int compare(NetworkLink link1, NetworkLink link2) { @@ -123,8 +123,8 @@ public class NetworkLibrary { myUpdateChildren = true; } - public void invalidateAccountDependents() { - myUpdateAccountDependents = true; + public void invalidateVisibility() { + myUpdateVisibility = true; } private void makeUpToDate() { @@ -192,12 +192,12 @@ public class NetworkLibrary { } } - private void updateAccountDependents() { + private void updateVisibility() { for (FBTree tree: myRootTree.subTrees()) { if (!(tree instanceof NetworkCatalogTree)) { continue; } - ((NetworkCatalogTree) tree).updateAccountDependents(); + ((NetworkCatalogTree) tree).updateVisibility(); } } @@ -206,9 +206,9 @@ public class NetworkLibrary { myUpdateChildren = false; makeUpToDate(); } - if (myUpdateAccountDependents) { - myUpdateAccountDependents = false; - updateAccountDependents(); + if (myUpdateVisibility) { + myUpdateVisibility = false; + updateVisibility(); } } diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java index 840013586..54c447e94 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java @@ -60,7 +60,7 @@ public class NetworkCatalogTree extends NetworkTree { } - public void updateAccountDependents() { + public void updateVisibility() { final LinkedList toRemove = new LinkedList(); ListIterator nodeIterator = subTrees().listIterator(); @@ -85,7 +85,7 @@ public class NetworkCatalogTree extends NetworkTree { NetworkCatalogTree child = (NetworkCatalogTree) currentNode; if (child.Item == currentItem) { if (child.Item.isVisible()) { - child.updateAccountDependents(); + child.updateVisibility(); } else { toRemove.add(child); }