introduced LibraryTree.getTreeTitle() method

src/org/geometerplus/android/fbreader/library/FileItem.java

@@ -74,6 +74,11 @@ class FileItem extends LibraryTree implements ZLAndroidTree {
 		return myName != null ? myName : myFile.getShortName();
 	}
 
+	@Override
+	public String getTreeTitle() {
+		return myFile.getPath();
+	}
+
 	@Override
 	protected String getStringId() {
 		return myFile.getPath();

src/org/geometerplus/android/fbreader/library/FileManager.java

@@ -43,11 +43,10 @@ public final class FileManager extends BaseActivity {
 		final ListAdapter adapter = new ListAdapter(this, new ArrayList<FBTree>());
 
 		myFileItem = LibraryInstance.getLibraryTree(myTreeKey);
+		setTitle(myFileItem.getTreeTitle());
 		if (myFileItem instanceof FileItem) {
-			setTitle(myTreeKey.Id);
 			startUpdate();
 		} else {
-			setTitle(myFileItem.getName());
 			addItem(Paths.BooksDirectoryOption().getValue(), "fileTreeLibrary");
 			addItem("/", "fileTreeRoot");
 			addItem(Paths.cardDirectory(), "fileTreeCard");

src/org/geometerplus/android/fbreader/library/LibraryTreeActivity.java

@@ -22,8 +22,8 @@ package org.geometerplus.android.fbreader.library;
 import android.content.Intent;
 import android.os.Bundle;
 
-import org.geometerplus.fbreader.tree.FBTree;
 import org.geometerplus.fbreader.library.Library;
+import org.geometerplus.fbreader.library.LibraryTree;
 
 public class LibraryTreeActivity extends LibraryBaseActivity {
 	@Override
@@ -45,13 +45,9 @@ public class LibraryTreeActivity extends LibraryBaseActivity {
 			return;
 		}
 
-		final FBTree tree = LibraryInstance.getLibraryTree(myTreeKey);
+		final LibraryTree tree = LibraryInstance.getLibraryTree(myTreeKey);
 		if (tree != null) {
-			if (myTreeKey.Parent == null) {
+			setTitle(tree.getTreeTitle());
-				setTitle(tree.getSecondString());
-			} else {
-				setTitle(tree.getName());
-			}
 			final ListAdapter adapter = new ListAdapter(this, tree.subTrees());
 			setSelection(adapter.getFirstSelectedItemIndex());
 		}

src/org/geometerplus/fbreader/library/LibraryTree.java

@@ -21,8 +21,6 @@ package org.geometerplus.fbreader.library;
 
 import java.util.*;
 
-//import org.geometerplus.zlibrary.core.tree.ZLTree;
-
 import org.geometerplus.fbreader.tree.FBTree;
 
 public abstract class LibraryTree extends FBTree {
@@ -34,6 +32,10 @@ public abstract class LibraryTree extends FBTree {
 		super(parent);
 	}
 
+	public String getTreeTitle() {
+		return getName();
+	}
+
 	TagTree createTagSubTree(Tag tag) {
 		return new TagTree(this, tag);
 	}

src/org/geometerplus/fbreader/library/RootTree.java

@@ -36,7 +36,12 @@ public class RootTree extends LibraryTree {
 	}
 
 	@Override
-	public String getSummary() {
+	public String getTreeTitle() {
+		return getSecondString();
+	}
+
+	@Override
+	protected String getSummary() {
 		return myResource.getResource("summary").getValue();
 	}
 

src/org/geometerplus/fbreader/library/SearchResultsTree.java

@@ -28,7 +28,7 @@ class SearchResultsTree extends RootTree {
 	}
 
 	@Override
-	public String getSummary() {
+	protected String getSummary() {
 		return super.getSummary().replace("%s", myPattern);
 	}
 }