X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/f359d11a4d2c0b98de9687722f1487dcdad47a2b..d76b8fcdf710345193208d4079fb7bba2b1c6ea2:/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 a96f6345..d535802a 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1301,12 +1301,13 @@ OnSslUntrustedCertListener, EditNameDialogListener { if (second instanceof PreviewMediaFragment) { ((PreviewMediaFragment)second).stopPreview(true); } + setFile(getStorageManager().getFileById(removedFile.getParentId())); cleanSecondFragment(); } if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) { refreshListOfFilesFragment(); } - + invalidateOptionsMenu(); } else { Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); msg.show(); @@ -1357,9 +1358,19 @@ OnSslUntrustedCertListener, EditNameDialogListener { OCFile renamedFile = operation.getFile(); if (result.isSuccess()) { FileFragment details = getSecondFragment(); - if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) { - ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount()); - showDetails(renamedFile); + if (details != null) + if (details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) { + ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount()); + showDetails(renamedFile); + + } else if (details instanceof PreviewMediaFragment && renamedFile.equals(details.getFile())) { + ((PreviewMediaFragment) details).updateFile(renamedFile); + if (PreviewMediaFragment.canBePreviewed(renamedFile)) { + int position = ((PreviewMediaFragment)details).getPosition(); + startMediaPreview(renamedFile, position, true); + } else { + getFileOperationsHelper().openFile(renamedFile); + } } if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {