|
@@ -373,7 +373,7 @@ public class FileActivity extends ActionBarActivity
|
|
/** Called when a drawer has settled in a completely closed state. */
|
|
/** Called when a drawer has settled in a completely closed state. */
|
|
public void onDrawerClosed(View view) {
|
|
public void onDrawerClosed(View view) {
|
|
super.onDrawerClosed(view);
|
|
super.onDrawerClosed(view);
|
|
- updateActionBarTitleAndHomeButton(null);
|
|
|
|
|
|
+ updateActionBarTitleAndHomeButton(mFile);
|
|
invalidateOptionsMenu();
|
|
invalidateOptionsMenu();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -406,9 +406,16 @@ public class FileActivity extends ActionBarActivity
|
|
/// choose the appropiate title
|
|
/// choose the appropiate title
|
|
if (chosenFile == null) {
|
|
if (chosenFile == null) {
|
|
// mFile determines the title
|
|
// mFile determines the title
|
|
- inRoot = (mFile == null || mFile.getParentId() == 0);
|
|
|
|
|
|
+ OCFile currentDir = null;
|
|
|
|
+ if (mFile != null && mFile.isFolder()) {
|
|
|
|
+ currentDir = mFile;
|
|
|
|
+ } else {
|
|
|
|
+ currentDir = getStorageManager().getFileById(mFile.getParentId());
|
|
|
|
+ }
|
|
|
|
+ inRoot = (mFile == null || currentDir.getParentId() == 0);
|
|
if (!inRoot) {
|
|
if (!inRoot) {
|
|
- title = mFile.getFileName();
|
|
|
|
|
|
+ title = mFile.getFileName();
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|