mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

FileDisplayActivity: always try to reload folder on onResume

Browse source 
This makes it so that the folder loads even without granting storage permission, which is the expected behaviour now

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey Vilas 2022-03-14 17:39:21 +01:00
parent 2a4316a298
commit 1a9014ee3b
No known key found for this signature in database
GPG key ID: 2585783189A62105
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -1075,7 +1075,7 @@ public class FileDisplayActivity extends FileActivity
OCFileListFragment ocFileListFragment = (OCFileListFragment) leftFragment; OCFileListFragment ocFileListFragment = (OCFileListFragment) leftFragment;
ocFileListFragment.setLoading(mSyncInProgress); ocFileListFragment.setLoading(mSyncInProgress);
syncAndUpdateFolder(false); syncAndUpdateFolder(false, true);
OCFile startFile = null; OCFile startFile = null;
if (getIntent() != null && getIntent().getParcelableExtra(EXTRA_FILE) != null) { if (getIntent() != null && getIntent().getParcelableExtra(EXTRA_FILE) != null) {
@ -2221,11 +2221,15 @@ public class FileDisplayActivity extends FileActivity
} }
private void syncAndUpdateFolder(boolean ignoreETag) { private void syncAndUpdateFolder(boolean ignoreETag) {
syncAndUpdateFolder(ignoreETag, false);
}
private void syncAndUpdateFolder(boolean ignoreETag, boolean ignoreFocus) {
OCFileListFragment listOfFiles = getListOfFilesFragment(); OCFileListFragment listOfFiles = getListOfFilesFragment();
if (listOfFiles != null && !listOfFiles.isSearchFragment()) { if (listOfFiles != null && !listOfFiles.isSearchFragment()) {
OCFile folder = listOfFiles.getCurrentFile(); OCFile folder = listOfFiles.getCurrentFile();
if (folder != null) { if (folder != null) {
startSyncFolderOperation(folder, ignoreETag); startSyncFolderOperation(folder, ignoreETag, ignoreFocus);
} }
} }
} }