X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3adb39a15e34d046dfd587bf63e91786cb295c5c..6cb184ab6377431383d7a6b30da30c3c4b02d8d7:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index b46693e8..b62eb22c 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -378,7 +378,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { return null; } - protected FileFragment getSecondFragment() { + public FileFragment getSecondFragment() { Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT); if (second != null) { return (FileFragment)second; @@ -397,7 +397,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { updateNavigationElementsInActionBar(null); } - protected void refeshListOfFilesFragment() { + protected void refreshListOfFilesFragment() { OCFileListFragment fileListFragment = getListOfFilesFragment(); if (fileListFragment != null) { fileListFragment.listDirectory(); @@ -957,7 +957,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { (uploadedRemotePath.startsWith(currentDir.getRemotePath())); if (sameAccount && isDescendant) { - refeshListOfFilesFragment(); + refreshListOfFilesFragment(); } boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false); @@ -1012,7 +1012,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { boolean isDescendant = isDescendant(downloadedRemotePath); if (sameAccount && isDescendant) { - refeshListOfFilesFragment(); + refreshListOfFilesFragment(); refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)); } @@ -1245,9 +1245,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) { if (result.isSuccess()) { refreshShowDetails(); - /* TODO WIP COMMENT - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } } @@ -1255,14 +1253,11 @@ OnSslUntrustedCertListener, EditNameDialogListener { private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) { if (result.isSuccess()) { refreshShowDetails(); - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); + } else if (result.getCode() == ResultCode.SHARE_NOT_FOUND) { cleanSecondFragment(); - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } } @@ -1301,9 +1296,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { cleanSecondFragment(); } if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) { - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } } else { @@ -1326,10 +1319,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) { if (result.isSuccess()) { dismissLoadingDialog(); - /* TODO WIP COMMENT - refeshListOfFilesFragment(); - */ - + refreshListOfFilesFragment(); } else { dismissLoadingDialog(); if (result.getCode() == ResultCode.INVALID_CHARACTER_IN_NAME) { @@ -1363,9 +1353,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount()); } if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) { - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } } else { @@ -1401,9 +1389,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { } else { if (operation.transferWasRequested()) { - /* - refeshListOfFilesFragment(); - */ onTransferStateChanged(syncedFile, true, true); } else { @@ -1439,14 +1424,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { // Create directory path += newDirectoryName + OCFile.PATH_SEPARATOR; - RemoteOperation operation = new CreateFolderOperation(path, false, getStorageManager()); - operation.execute( getAccount(), - FileDisplayActivity.this, - FileDisplayActivity.this, - getHandler(), - FileDisplayActivity.this); - - showLoadingDialog(); + getFileOperationsHelper().createFolder(path, false); } } } @@ -1585,10 +1563,12 @@ OnSslUntrustedCertListener, EditNameDialogListener { Account account = getAccount(); if (mDownloaderBinder != null && mDownloaderBinder.isDownloading(account, file)) { mDownloaderBinder.cancel(account, file); + refreshListOfFilesFragment(); onTransferStateChanged(file, false, false); } else if (mUploaderBinder != null && mUploaderBinder.isUploading(account, file)) { mUploaderBinder.cancel(account, file); + refreshListOfFilesFragment(); if (!file.fileExists()) { cleanSecondFragment();