Skip to content

Commit c510bbb

Browse files
committed
fix back button action
Signed-off-by: alperozturk <[email protected]>
1 parent 27ed93e commit c510bbb

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
648648
}
649649

650650
// from navigation user always sees root level
651-
final var ocFileListFragment = getOCFileListFragment();
652-
if (ocFileListFragment != null) {
653-
ocFileListFragment.resetFileDepth();
654-
}
651+
resetFileDepth();
655652

656653
if (this instanceof FileDisplayActivity fda) {
657654
fda.configureMenuItem();
@@ -695,7 +692,15 @@ public void openAddAccount() {
695692
}
696693
}
697694

695+
private void resetFileDepth() {
696+
final var ocFileListFragment = getOCFileListFragment();
697+
if (ocFileListFragment != null) {
698+
ocFileListFragment.resetFileDepth();
699+
}
700+
}
701+
698702
protected void openSharedTab() {
703+
resetFileDepth();
699704
resetOnlyPersonalAndOnDevice();
700705
SearchEvent searchEvent = new SearchEvent("", SearchRemoteOperation.SearchType.SHARED_FILTER);
701706
launchActivityForSearch(searchEvent, R.id.nav_shared);

app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ public String getActionBarRootTitle() {
200200
return result;
201201
}
202202

203-
public String getActionBarTitle(OCFile chosenFile) {
204-
if (isRoot(chosenFile)) {
203+
public String getActionBarTitle(OCFile chosenFile, boolean isRoot) {
204+
if (isRoot) {
205205
return getActionBarRootTitle();
206206
}
207207

@@ -225,14 +225,19 @@ protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
225225

226226
final OCFileDepth currentDirDepth = getCurrentDirDepth();
227227
final boolean isRoot = isRoot(chosenFile) || currentDirDepth == OCFileDepth.Root;
228-
final String title = getActionBarTitle(chosenFile);
228+
final String title = getActionBarTitle(chosenFile, isRoot);
229229
updateActionBarTitleAndHomeButtonByString(title);
230230

231231
final boolean isToolbarStyleSearch = DrawerActivity.isToolbarStyleSearch();
232232
final boolean canShowSearchBar = (isHomeSearchToolbarShow && isRoot && isToolbarStyleSearch);
233233

234234
showHomeSearchToolbar(canShowSearchBar);
235235
mSearchText.setText(getString(R.string.appbar_search_in, title));
236+
237+
final var actionBar = getSupportActionBar();
238+
if (actionBar != null) {
239+
viewThemeUtils.files.themeActionBar(this, actionBar, title, isRoot);
240+
}
236241
}
237242

238243

0 commit comments

Comments
 (0)