Skip to content

Commit fec57f4

Browse files
committed
fix: search fragment value
Signed-off-by: alperozturk <[email protected]>
1 parent 26bb229 commit fec57f4

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,11 @@ private void checkAssistantBottomNavigationMenu() {
264264
.setVisible(isAssistantAvailable);
265265
}
266266

267-
private void openFavoritesTab(int menuItemId) {
267+
private void openFavoritesTab() {
268268
resetOnlyPersonalAndOnDevice();
269269
setupToolbar();
270-
handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH), menuItemId);
270+
SearchEvent searchEvent = new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH);
271+
launchActivityForSearch(searchEvent, R.id.nav_favorites);
271272
}
272273

273274
private void openMediaTab(int menuItemId) {
@@ -545,7 +546,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
545546

546547
closeDrawer();
547548
} else if (itemId == R.id.nav_favorites) {
548-
openFavoritesTab(menuItem.getItemId());
549+
openFavoritesTab();
549550
} else if (itemId == R.id.nav_gallery) {
550551
openMediaTab(menuItem.getItemId());
551552
} else if (itemId == R.id.nav_on_device) {
@@ -618,7 +619,7 @@ private void handleBottomNavigationViewClicks() {
618619
}
619620
EventBus.getDefault().post(new ChangeMenuEvent());
620621
} else if (menuItemId == R.id.nav_favorites) {
621-
openFavoritesTab(menuItem.getItemId());
622+
openFavoritesTab();
622623
} else if (menuItemId == R.id.nav_assistant && !(this instanceof ComposeActivity)) {
623624
startComposeActivity(new ComposeDestination.AssistantScreen(null), R.string.assistant_screen_top_bar_title);
624625
} else if (menuItemId == R.id.nav_gallery) {

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,12 @@ public int onBrowseUp() {
10591059
Pair<Integer, OCFile> result = futureResult.get();
10601060
mFile = result.second;
10611061
setFileDepth(mFile);
1062+
1063+
// since on browse down sets it to the false, browse up should set back to true if current search type is not NO_SEARCH
1064+
if (mFile.isRootDirectory() && currentSearchType != NO_SEARCH) {
1065+
searchFragment = true;
1066+
}
1067+
10621068
updateFileList();
10631069
return result.first;
10641070
} catch (Exception e) {

0 commit comments

Comments
 (0)