mirror of
https://github.com/nextcloud/android.git
synced 2024-10-23 20:46:04 +03:00
getIsSearchFragment() -> isSearchFragment()
closing search / getting back from preview image shows current dir Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
parent
d2cf2b651c
commit
4eed5b1a48
2 changed files with 15 additions and 9 deletions
|
@ -816,6 +816,11 @@ public class FileDisplayActivity extends HookActivity
|
|||
setDrawerIndicatorEnabled(isDrawerIndicatorAvailable()); // order matters
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
mDrawerToggle.syncState();
|
||||
|
||||
if (getListOfFilesFragment() != null) {
|
||||
getListOfFilesFragment().setSearchFragment(false);
|
||||
getListOfFilesFragment().refreshDirectory();
|
||||
}
|
||||
} else {
|
||||
searchView.post(new Runnable() {
|
||||
@Override
|
||||
|
@ -1197,7 +1202,7 @@ public class FileDisplayActivity extends HookActivity
|
|||
|
||||
if (searchView != null && !TextUtils.isEmpty(searchQuery)) {
|
||||
searchView.setQuery(searchQuery, true);
|
||||
} else if (getListOfFilesFragment() != null && !getListOfFilesFragment().getIsSearchFragment()
|
||||
} else if (getListOfFilesFragment() != null && !getListOfFilesFragment().isSearchFragment()
|
||||
&& startFile == null) {
|
||||
refreshListOfFilesFragment(false);
|
||||
} else {
|
||||
|
@ -1206,7 +1211,7 @@ public class FileDisplayActivity extends HookActivity
|
|||
}
|
||||
|
||||
// Listen for sync messages
|
||||
if (getListOfFilesFragment() != null && !getListOfFilesFragment().getIsSearchFragment()) {
|
||||
if (getListOfFilesFragment() != null && !getListOfFilesFragment().isSearchFragment()) {
|
||||
IntentFilter syncIntentFilter = new IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START);
|
||||
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_END);
|
||||
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED);
|
||||
|
@ -2425,11 +2430,9 @@ public class FileDisplayActivity extends HookActivity
|
|||
|
||||
private void refreshList(boolean ignoreETag) {
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
if (listOfFiles != null && !listOfFiles.getIsSearchFragment()) {
|
||||
if (listOfFiles != null && !listOfFiles.isSearchFragment()) {
|
||||
OCFile folder = listOfFiles.getCurrentFile();
|
||||
if (folder != null) {
|
||||
/*mFile = mContainerActivity.getStorageManager().getFileById(mFile.getFileId());
|
||||
listDirectory(mFile);*/
|
||||
startSyncFolderOperation(folder, ignoreETag);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|||
mFile = savedInstanceState.getParcelable(KEY_FILE);
|
||||
}
|
||||
|
||||
searchFragment = currentSearchType != null;
|
||||
searchFragment = currentSearchType != null && searchEvent != null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -234,9 +234,11 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|||
bottomNavigationView = v.findViewById(R.id.bottom_navigation_view);
|
||||
|
||||
if (savedInstanceState != null
|
||||
&& Parcels.unwrap(savedInstanceState.getParcelable(KEY_CURRENT_SEARCH_TYPE)) != null) {
|
||||
currentSearchType = Parcels.unwrap(savedInstanceState.getParcelable(KEY_CURRENT_SEARCH_TYPE));
|
||||
&& Parcels.unwrap(savedInstanceState.getParcelable(KEY_CURRENT_SEARCH_TYPE)) != null &&
|
||||
Parcels.unwrap(savedInstanceState.getParcelable(OCFileListFragment.SEARCH_EVENT)) != null) {
|
||||
searchFragment = true;
|
||||
currentSearchType = Parcels.unwrap(savedInstanceState.getParcelable(KEY_CURRENT_SEARCH_TYPE));
|
||||
searchEvent = Parcels.unwrap(savedInstanceState.getParcelable(OCFileListFragment.SEARCH_EVENT));
|
||||
} else {
|
||||
currentSearchType = SearchType.NO_SEARCH;
|
||||
}
|
||||
|
@ -1547,6 +1549,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|||
|
||||
mRefreshListLayout.setRefreshing(false);
|
||||
} else {
|
||||
searchFragment = false;
|
||||
super.onRefresh();
|
||||
}
|
||||
}
|
||||
|
@ -1555,7 +1558,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|||
this.searchFragment = searchFragment;
|
||||
}
|
||||
|
||||
public boolean getIsSearchFragment() {
|
||||
public boolean isSearchFragment() {
|
||||
return searchFragment;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue