mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 10:49:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed title in action bar when user clicks on upload notification in progress / failed

Browse source
This commit is contained in:
David A. Velasco 2015-07-02 13:03:48 +02:00
parent 04d4be82cb
commit 0f0e210d69
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -405,19 +405,14 @@ public class FileActivity extends ActionBarActivity
/// choose the appropiate title /// choose the appropiate title
if (chosenFile == null) { if (chosenFile == null) {
// mFile determines the title chosenFile = mFile; // if no file is passed, current file decides
inRoot = (mFile == null || mFile.getParentId() == 0); }
if (!inRoot) { inRoot = (
title = mFile.getFileName(); chosenFile == null ||
} (chosenFile.isFolder() && chosenFile.getParentId() == FileDataStorageManager.ROOT_PARENT_ID)
);
} else if (chosenFile.getParentId() != 0){ if (!inRoot) {
// chosenFile determines the title, instead of mFile
title = chosenFile.getFileName(); title = chosenFile.getFileName();
inRoot = false;
} else{
inRoot = true;
} }
/// set the chosen title /// set the chosen title