X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c6edcab5a2f81773f05b8f796f2c356c2c2aeb4d..c39e851f5eada08c93d3a57d41054ea112b4bfcf:/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 638f8d74..6cfa56c5 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -78,16 +78,15 @@ import com.owncloud.android.operations.RenameFileOperation; import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.operations.SynchronizeFolderOperation; import com.owncloud.android.operations.UnshareLinkOperation; -import com.owncloud.android.services.OperationsService; import com.owncloud.android.syncadapter.FileSyncAdapter; -import com.owncloud.android.ui.dialog.EditNameDialog; +import com.owncloud.android.ui.dialog.CreateFolderDialogFragment; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog; -import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener; import com.owncloud.android.ui.fragment.FileDetailFragment; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.ui.fragment.OCFileListFragment; import com.owncloud.android.ui.preview.PreviewImageActivity; +import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.ui.preview.PreviewVideoActivity; import com.owncloud.android.utils.DisplayUtils; @@ -102,15 +101,13 @@ import com.owncloud.android.utils.Log_OC; */ public class FileDisplayActivity extends HookActivity implements -FileFragment.ContainerActivity, OnNavigationListener, -OnSslUntrustedCertListener, EditNameDialogListener { +FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener { private ArrayAdapter mDirectories; private SyncBroadcastReceiver mSyncBroadcastReceiver; private UploadFinishReceiver mUploadFinishReceiver; private DownloadFinishReceiver mDownloadFinishReceiver; - //private OperationsServiceReceiver mOperationsServiceReceiver; private RemoteOperationResult mLastSslUntrustedServerResult = null; private boolean mDualPane; @@ -119,12 +116,10 @@ OnSslUntrustedCertListener, EditNameDialogListener { private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS"; - //private static final String KEY_REFRESH_SHARES_IN_PROGRESS = "SHARES_IN_PROGRESS"; private static final String KEY_WAITING_TO_SEND = "WAITING_TO_SEND"; public static final int DIALOG_SHORT_WAIT = 0; private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1; - //private static final int DIALOG_SSL_VALIDATOR = 2; private static final int DIALOG_CERT_NOT_SAVED = 2; public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS"; @@ -140,7 +135,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { private OCFile mWaitingToPreview; private boolean mSyncInProgress = false; - //private boolean mRefreshSharesInProgress = false; private String DIALOG_UNTRUSTED_CERT; @@ -169,13 +163,11 @@ OnSslUntrustedCertListener, EditNameDialogListener { if(savedInstanceState != null) { mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW); mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS); - //mRefreshSharesInProgress = savedInstanceState.getBoolean(KEY_REFRESH_SHARES_IN_PROGRESS); mWaitingToSend = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_SEND); } else { mWaitingToPreview = null; mSyncInProgress = false; - //mRefreshSharesInProgress = false; mWaitingToSend = null; } @@ -207,9 +199,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { protected void onStart() { super.onStart(); getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId()); - /* - refeshListOfFilesFragment(); - */ } @Override @@ -387,7 +376,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; @@ -395,7 +384,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { return null; } - public void cleanSecondFragment() { + protected void cleanSecondFragment() { Fragment second = getSecondFragment(); if (second != null) { FragmentTransaction tr = getSupportFragmentManager().beginTransaction(); @@ -406,14 +395,12 @@ OnSslUntrustedCertListener, EditNameDialogListener { updateNavigationElementsInActionBar(null); } - /* TODO WIP COMMENT - protected void refeshListOfFilesFragment() { + protected void refreshListOfFilesFragment() { OCFileListFragment fileListFragment = getListOfFilesFragment(); if (fileListFragment != null) { fileListFragment.listDirectory(); } } - */ protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath, boolean success) { FileFragment secondFragment = getSecondFragment(); @@ -464,7 +451,8 @@ OnSslUntrustedCertListener, EditNameDialogListener { boolean retval = true; switch (item.getItemId()) { case R.id.action_create_dir: { - EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this); + CreateFolderDialogFragment dialog = + CreateFolderDialogFragment.newInstance(getCurrentDir()); dialog.show(getSupportFragmentManager(), "createdirdialog"); break; } @@ -681,7 +669,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { // Listen for sync messages IntentFilter syncIntentFilter = new IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START); syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_END); - //syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED); syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED); syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED); syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED); @@ -700,14 +687,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { mDownloadFinishReceiver = new DownloadFinishReceiver(); registerReceiver(mDownloadFinishReceiver, downloadIntentFilter); - // Listen for messages from the OperationsService - /* - IntentFilter operationsIntentFilter = new IntentFilter(OperationsService.ACTION_OPERATION_ADDED); - operationsIntentFilter.addAction(OperationsService.ACTION_OPERATION_FINISHED); - mOperationsServiceReceiver = new OperationsServiceReceiver(); - LocalBroadcastManager.getInstance(this).registerReceiver(mOperationsServiceReceiver, operationsIntentFilter); - */ - Log_OC.d(TAG, "onResume() end"); } @@ -729,12 +708,9 @@ OnSslUntrustedCertListener, EditNameDialogListener { unregisterReceiver(mDownloadFinishReceiver); mDownloadFinishReceiver = null; } - /* - if (mOperationsServiceReceiver != null) { - LocalBroadcastManager.getInstance(this).unregisterReceiver(mOperationsServiceReceiver); - mOperationsServiceReceiver = null; - } - */ + + dismissLoadingDialog(); + Log_OC.d(TAG, "onPause() end"); } @@ -933,32 +909,17 @@ OnSslUntrustedCertListener, EditNameDialogListener { currentFile = currentDir; } - /* TODO WIP COMMENT if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) { OCFileListFragment fileListFragment = getListOfFilesFragment(); if (fileListFragment != null) { fileListFragment.listDirectory(currentDir); } } - */ setFile(currentFile); } mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event)); - /* - if (synchResult != null && - synchResult.isSuccess() && - (SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SYNCED.equals(event) || - FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED.equals(event) - ) && - !mRefreshSharesInProgress && - getFileOperationsHelper().isSharedSupported(FileDisplayActivity.this) - ) { - startGetShares(); - } - */ - } removeStickyBroadcast(intent); Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress); @@ -979,6 +940,9 @@ OnSslUntrustedCertListener, EditNameDialogListener { } + /** + * Once the file upload has finished -> update view + */ private class UploadFinishReceiver extends BroadcastReceiver { /** * Once the file upload has finished -> update view @@ -991,14 +955,52 @@ OnSslUntrustedCertListener, EditNameDialogListener { String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME); boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name); OCFile currentDir = getCurrentDir(); - boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(currentDir.getRemotePath())); + boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && + (uploadedRemotePath.startsWith(currentDir.getRemotePath())); + if (sameAccount && isDescendant) { - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); + } + + boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false); + boolean renamedInUpload = getFile().getRemotePath(). + equals(intent.getStringExtra(FileUploader.EXTRA_OLD_REMOTE_PATH)); + boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) || + renamedInUpload; + FileFragment details = getSecondFragment(); + boolean detailFragmentIsShown = (details != null && + details instanceof FileDetailFragment); + + if (sameAccount && sameFile && detailFragmentIsShown) { + if (uploadWasFine) { + setFile(getStorageManager().getFileByPath(uploadedRemotePath)); + } + if (renamedInUpload) { + String newName = (new File(uploadedRemotePath)).getName(); + Toast msg = Toast.makeText( + context, + String.format( + getString(R.string.filedetails_renamed_in_upload_msg), + newName), + Toast.LENGTH_LONG); + msg.show(); + } + if (uploadWasFine || getFile().fileExists()) { + ((FileDetailFragment)details).updateFileDetails(false, true); + } else { + cleanSecondFragment(); + } + + // Force the preview if the file is an image + if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) { + startImagePreview(getFile()); + } // TODO what about other kind of previews? } + + removeStickyBroadcast(intent); + } - + } @@ -1016,9 +1018,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { boolean isDescendant = isDescendant(downloadedRemotePath); if (sameAccount && isDescendant) { - /* TODO WIP COMMENT - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)); } @@ -1044,46 +1044,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { } - /** - * Class waiting for broadcast events from the {@link OperationsService}. - * - * Updates the list of files when a get for shares is finished; at this moment the refresh of shares is the only - * operation performed in {@link OperationsService}. - * - * In the future will handle the progress or finalization of all the operations performed in {@link OperationsService}, - * probably all the operations associated to the app model. - */ - private class OperationsServiceReceiver extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - if (OperationsService.ACTION_OPERATION_ADDED.equals(intent.getAction())) { - - } else if (OperationsService.ACTION_OPERATION_FINISHED.equals(intent.getAction())) { - //mRefreshSharesInProgress = false; - - Account account = intent.getParcelableExtra(OperationsService.EXTRA_ACCOUNT); - RemoteOperationResult getSharesResult = (RemoteOperationResult)intent.getSerializableExtra(OperationsService.EXTRA_RESULT); - if (getAccount() != null && account.name.equals(getAccount().name) - && getStorageManager() != null - ) { - /* - refeshListOfFilesFragment(); - */ - } - if ((getSharesResult != null) && - RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED.equals(getSharesResult.getCode())) { - mLastSslUntrustedServerResult = getSharesResult; - showUntrustedCertDialog(mLastSslUntrustedServerResult); - } - - //setSupportProgressBarIndeterminateVisibility(mRefreshSharesInProgress || mSyncInProgress); - } - - } - - } - public void browseToRoot() { OCFileListFragment listOfFiles = getListOfFilesFragment(); if (listOfFiles != null) { // should never be null, indeed @@ -1173,19 +1133,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { } - /** - * {@inheritDoc} - */ - - @Override - public void onFileStateChanged() { - /* TODO WIP COMMENT - refeshListOfFilesFragment(); - updateNavigationElementsInActionBar(getSecondFragment().getFile()); - */ - } - - @Override protected ServiceConnection newTransferenceServiceConnection() { return new ListServiceConnection(); @@ -1199,8 +1146,12 @@ OnSslUntrustedCertListener, EditNameDialogListener { if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) { Log_OC.d(TAG, "Download service connected"); mDownloaderBinder = (FileDownloaderBinder) service; - if (mWaitingToPreview != null) { - requestForDownload(); + if (mWaitingToPreview != null) + if (getStorageManager() != null) { + mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId()); // update the file + if (!mWaitingToPreview.isDown()) { + requestForDownload(); + } } } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) { @@ -1304,9 +1255,7 @@ OnSslUntrustedCertListener, EditNameDialogListener { private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) { if (result.isSuccess()) { refreshShowDetails(); - /* TODO WIP COMMENT - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } } @@ -1314,14 +1263,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(); } } @@ -1357,14 +1303,16 @@ OnSslUntrustedCertListener, EditNameDialogListener { OCFile removedFile = operation.getFile(); FileFragment second = getSecondFragment(); if (second != null && removedFile.equals(second.getFile())) { + if (second instanceof PreviewMediaFragment) { + ((PreviewMediaFragment)second).stopPreview(true); + } + setFile(getStorageManager().getFileById(removedFile.getParentId())); cleanSecondFragment(); } if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) { - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } - + invalidateOptionsMenu(); } else { Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); msg.show(); @@ -1385,10 +1333,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) { @@ -1418,13 +1363,23 @@ 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()); + 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())) { - /* - refeshListOfFilesFragment(); - */ + refreshListOfFilesFragment(); } } else { @@ -1460,9 +1415,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { } else { if (operation.transferWasRequested()) { - /* - refeshListOfFilesFragment(); - */ onTransferStateChanged(syncedFile, true, true); } else { @@ -1489,28 +1441,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { } - public void onDismiss(EditNameDialog dialog) { - if (dialog.getResult()) { - String newDirectoryName = dialog.getNewFilename().trim(); - Log_OC.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName); - if (newDirectoryName.length() > 0) { - String path = getCurrentDir().getRemotePath(); - - // 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(); - } - } - } - - private void requestForDownload() { Account account = getAccount(); if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) { @@ -1554,17 +1484,6 @@ OnSslUntrustedCertListener, EditNameDialogListener { setSupportProgressBarIndeterminateVisibility(true); } - /* - private void startGetShares() { - // Get shared files/folders - Intent intent = new Intent(this, OperationsService.class); - intent.putExtra(OperationsService.EXTRA_ACCOUNT, getAccount()); - startService(intent); - - mRefreshSharesInProgress = true; - } - */ - /** * Show untrusted cert dialog */ @@ -1655,10 +1574,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();