X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/be51b2c4aa8fff92f73bd0846ee31a69cc36c528..d22fc90d67b447c558681dbe2dd65b82d4eb46ea:/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 77e8cba9..7ffe9000 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +23,6 @@ import java.io.File; import android.accounts.Account; import android.app.AlertDialog; import android.app.ProgressDialog; -import android.app.AlertDialog.Builder; import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -36,8 +34,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.content.pm.PackageInfo; +import android.content.res.Configuration; import android.content.res.Resources.NotFoundException; import android.database.Cursor; import android.net.Uri; @@ -48,11 +45,9 @@ import android.preference.PreferenceManager; import android.provider.MediaStore; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; @@ -66,7 +61,7 @@ import com.actionbarsherlock.view.Window; import com.owncloud.android.AccountUtils; import com.owncloud.android.Log_OC; import com.owncloud.android.R; -import com.owncloud.android.authenticator.AccountAuthenticator; +import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.datamodel.DataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -75,7 +70,7 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileObserverService; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; -import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.operations.CreateFolderOperation; import com.owncloud.android.operations.OnRemoteOperationListener; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -84,7 +79,6 @@ import com.owncloud.android.operations.RenameFileOperation; import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.syncadapter.FileSyncService; -import com.owncloud.android.ui.dialog.ChangelogDialog; import com.owncloud.android.ui.dialog.EditNameDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; @@ -95,8 +89,7 @@ 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 eu.alefzero.webdav.WebdavClient; +import com.owncloud.android.ui.preview.PreviewVideoActivity; /** * Displays, what files the user has available in his ownCloud. @@ -127,13 +120,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private boolean mBackFromCreatingFirstAccount; private static final int DIALOG_SETUP_ACCOUNT = 0; - private static final int DIALOG_CREATE_DIR = 1; - public static final int DIALOG_SHORT_WAIT = 3; - private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4; - private static final int DIALOG_SSL_VALIDATOR = 5; - private static final int DIALOG_CERT_NOT_SAVED = 6; - private static final String DIALOG_CHANGELOG_TAG = "DIALOG_CHANGELOG"; - + public static final int DIALOG_SHORT_WAIT = 1; + private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 2; + private static final int DIALOG_SSL_VALIDATOR = 3; + private static final int DIALOG_CERT_NOT_SAVED = 4; private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1; private static final int ACTION_SELECT_MULTIPLE_FILES = 2; @@ -142,11 +132,17 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private OCFile mWaitingToPreview; private Handler mHandler; + + private Configuration mNewConfigurationChangeToApplyOnStart; + private boolean mStarted; @Override public void onCreate(Bundle savedInstanceState) { Log_OC.d(getClass().toString(), "onCreate() start"); super.onCreate(savedInstanceState); + mStarted = false; + + mHandler = new Handler(); /// Load of parameters from received intent Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT); @@ -156,7 +152,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements /// Load of saved instance state: keep this always before initDataFromCurrentAccount() if(savedInstanceState != null) { - // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES + // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER. SOME TIMES mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW); @@ -207,21 +203,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements setContentView(R.layout.files); mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); mDualPane = (findViewById(R.id.file_details_container) != null); - if (mDualPane) { - if (savedInstanceState == null) initFileDetailsInDualPane(); - } else { - // quick patchES to fix problem in turn from landscape to portrait, when a file is selected in the right pane - // TODO serious refactorization in activities and fragments providing file browsing and handling - if (mCurrentFile != null) { - onFileClick(mCurrentFile); - mCurrentFile = null; - } - Fragment rightPanel = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (rightPanel != null) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.remove(rightPanel); - transaction.commit(); - } + if (mDualPane && savedInstanceState == null) { + initFileDetailsInDualPane(); } // Action bar setup @@ -234,46 +217,29 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to workaround bug in its implementation - // show changelog, if needed - //showChangeLog(); mBackFromCreatingFirstAccount = false; Log_OC.d(getClass().toString(), "onCreate() end"); } - /** - * Shows a dialog with the change log of the current version after each app update - * - * TODO make it permanent; by now, only to advice the workaround app for 4.1.x - */ - private void showChangeLog() { - if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.JELLY_BEAN) { - final String KEY_VERSION = "version"; - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - int currentVersionNumber = 0; - int savedVersionNumber = sharedPref.getInt(KEY_VERSION, 0); - try { - PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0); - currentVersionNumber = pi.versionCode; - } catch (Exception e) {} - - if (currentVersionNumber > savedVersionNumber) { - ChangelogDialog.newInstance(true).show(getSupportFragmentManager(), DIALOG_CHANGELOG_TAG); - Editor editor = sharedPref.edit(); - editor.putInt(KEY_VERSION, currentVersionNumber); - editor.commit(); - } + @Override + public void onConfigurationChanged (Configuration newConfig) { + super.onConfigurationChanged(newConfig); + if (mStarted) { + checkConfigurationChange(newConfig); + } else { + mNewConfigurationChangeToApplyOnStart = newConfig; } } - + /** * Launches the account creation activity. To use when no ownCloud account is available */ private void createFirstAccount() { Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT); - intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); + intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTHORITY }); startActivity(intent); // the new activity won't be created until this.onStart() and this.onResume() are finished; } @@ -316,7 +282,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (mCurrentFile != null) { if (PreviewMediaFragment.canBePreviewed(mCurrentFile)) { if (mCurrentFile.isDown()) { - transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); + boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); + transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this), startPlaybackPosition, autoplay), FileDetailFragment.FTAG); } else { transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); mWaitingToPreview = mCurrentFile; @@ -335,6 +303,45 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override + public void onStart() { + super.onStart(); + if (mNewConfigurationChangeToApplyOnStart != null) { + checkConfigurationChange(mNewConfigurationChangeToApplyOnStart); + mNewConfigurationChangeToApplyOnStart = null; + } + mStarted = true; + } + + @Override + public void onStop() { + super.onStop(); + mStarted = false; + } + + + private void checkConfigurationChange(Configuration newConfig) { + FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + if (fragment != null + && fragment.getFile() != null + && (newConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE + && newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE) { + + onFileClick(fragment.getFile(), true); + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.remove((Fragment)fragment); + transaction.commit(); + + } else { + finish(); + Intent intent = new Intent(this, FileDisplayActivity.class); + intent.putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir); + intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); + startActivity(intent); + } + } + + + @Override public void onDestroy() { super.onDestroy(); if (mDownloadConnection != null) @@ -357,7 +364,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements boolean retval = true; switch (item.getItemId()) { case R.id.action_create_dir: { - EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", this); + EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this); dialog.show(getSupportFragmentManager(), "createdirdialog"); break; } @@ -387,12 +394,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } private void startSynchronization() { - ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE); // cancel the current synchronizations of any ownCloud account + ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY); // cancel the current synchronizations of any ownCloud account Bundle bundle = new Bundle(); bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); ContentResolver.requestSync( AccountUtils.getCurrentOwnCloudAccount(this), - AccountAuthenticator.AUTH_TOKEN_TYPE, bundle); + AccountAuthenticator.AUTHORITY, bundle); } @@ -414,6 +421,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements * Called, when the user selected something for uploading */ public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) { requestSimpleUpload(data, resultCode); @@ -546,7 +554,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview); Log_OC.d(getClass().toString(), "onSaveInstanceState() end"); } - @Override protected void onResume() { @@ -652,53 +659,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements dialog = builder.create(); break; } - case DIALOG_CREATE_DIR: { - builder = new Builder(this); - final EditText dirNameInput = new EditText(getBaseContext()); - builder.setView(dirNameInput); - builder.setTitle(R.string.uploader_info_dirname); - int typed_color = getResources().getColor(R.color.setup_text_typed); - dirNameInput.setTextColor(typed_color); - builder.setPositiveButton(android.R.string.ok, - new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - String directoryName = dirNameInput.getText().toString(); - if (directoryName.trim().length() == 0) { - dialog.cancel(); - return; - } - - // Figure out the path where the dir needs to be created - String path; - if (mCurrentDir == null) { - // this is just a patch; we should ensure that mCurrentDir never is null - if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) { - OCFile file = new OCFile(OCFile.PATH_SEPARATOR); - mStorageManager.saveFile(file); - } - mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); - } - path = FileDisplayActivity.this.mCurrentDir.getRemotePath(); - - // Create directory - path += directoryName + OCFile.PATH_SEPARATOR; - Thread thread = new Thread(new DirectoryCreator(path, AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler())); - thread.start(); - - dialog.dismiss(); - - showDialog(DIALOG_SHORT_WAIT); - } - }); - builder.setNegativeButton(R.string.common_cancel, - new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - dialog.cancel(); - } - }); - dialog = builder.create(); - break; - } case DIALOG_SHORT_WAIT: { ProgressDialog working_dialog = new ProgressDialog(this); working_dialog.setMessage(getResources().getString( @@ -819,57 +779,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements return !mDirectories.isEmpty(); } - private class DirectoryCreator implements Runnable { - private String mTargetPath; - private Account mAccount; - private Handler mHandler; - - public DirectoryCreator(String targetPath, Account account, Handler handler) { - mTargetPath = targetPath; - mAccount = account; - mHandler = handler; - } - - @Override - public void run() { - WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext()); - boolean created = wdc.createDirectory(mTargetPath); - if (created) { - mHandler.post(new Runnable() { - @Override - public void run() { - dismissDialog(DIALOG_SHORT_WAIT); - - // Save new directory in local database - OCFile newDir = new OCFile(mTargetPath); - newDir.setMimetype("DIR"); - newDir.setParentId(mCurrentDir.getFileId()); - mStorageManager.saveFile(newDir); - - // Display the new folder right away - mFileList.listDirectory(); - } - }); - - } else { - mHandler.post(new Runnable() { - @Override - public void run() { - dismissDialog(DIALOG_SHORT_WAIT); - try { - Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); - msg.show(); - - } catch (NotFoundException e) { - Log_OC.e(TAG, "Error while trying to show fail message ", e); - } - } - }); - } - } - - } - // Custom array adapter to override text colors private class CustomArrayAdapter extends ArrayAdapter { @@ -1037,7 +946,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (success && waitedPreview) { mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId()); // update the file from database, for the local storage path FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, AccountUtils.getCurrentOwnCloudAccount(this), 0, true), FileDetailFragment.FTAG); transaction.commit(); mWaitingToPreview = null; @@ -1083,7 +992,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements * {@inheritDoc} */ @Override - public void onFileClick(OCFile file) { + public void onFileClick(OCFile file, boolean onOrientationChange) { if (file != null && PreviewImageFragment.canBePreviewed(file)) { // preview image - it handles the download, if needed startPreviewImage(file); @@ -1091,16 +1000,28 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } else if (file != null && PreviewMediaFragment.canBePreviewed(file)) { if (file.isDown()) { // general preview - startMediaPreview(file); + if (!onOrientationChange) { + startMediaPreview(file, 0, true, onOrientationChange); + } else { + int startPlaybackPosition = 0; + boolean autoplay = true; + Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + if (fragment != null && file.isVideo()) { + PreviewMediaFragment videoFragment = (PreviewMediaFragment)fragment; + startPlaybackPosition = videoFragment.getPosition(); + autoplay = videoFragment.isPlaying(); + } + startMediaPreview(file, startPlaybackPosition, autoplay, onOrientationChange); + } } else { // automatic download, preview on finish - startDownloadForPreview(file); + startDownloadForPreview(file, onOrientationChange); } } else { // details view - startDetails(file); + startDetails(file, onOrientationChange); } } @@ -1111,22 +1032,24 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements startActivity(showDetailsIntent); } - private void startMediaPreview(OCFile file) { - if (mDualPane) { + private void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay, boolean onOrientationChange) { + if (mDualPane && !onOrientationChange) { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, AccountUtils.getCurrentOwnCloudAccount(this), startPlaybackPosition, autoplay), FileDetailFragment.FTAG); transaction.commit(); } else { Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); + showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, startPlaybackPosition); + showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, autoplay); startActivity(showDetailsIntent); } } - private void startDownloadForPreview(OCFile file) { - if (mDualPane) { + private void startDownloadForPreview(OCFile file, boolean onOrientationChange) { + if (mDualPane && !onOrientationChange) { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); transaction.commit(); @@ -1142,8 +1065,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } - private void startDetails(OCFile file) { - if (mDualPane && !file.isImage()) { + private void startDetails(OCFile file, boolean onOrientationChange) { + if (mDualPane && !file.isImage() && !onOrientationChange) { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); transaction.commit(); @@ -1284,6 +1207,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } else if (operation instanceof SynchronizeFileOperation) { onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result); + + } else if (operation instanceof CreateFolderOperation) { + onCreateFolderOperationFinish((CreateFolderOperation)operation, result); } } @@ -1324,6 +1250,30 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } /** + * Updates the view associated to the activity after the finish of an operation trying create a new folder + * + * @param operation Creation operation performed. + * @param result Result of the creation. + */ + private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) { + if (result.isSuccess()) { + dismissDialog(DIALOG_SHORT_WAIT); + mFileList.listDirectory(); + + } else { + dismissDialog(DIALOG_SHORT_WAIT); + try { + Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); + msg.show(); + + } catch (NotFoundException e) { + Log_OC.e(TAG, "Error while trying to show fail message " , e); + } + } + } + + + /** * Updates the view associated to the activity after the finish of an operation trying to rename a * file. * @@ -1431,7 +1381,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements //dialog.dismiss(); if (dialog.getResult()) { String newDirectoryName = dialog.getNewFilename().trim(); - Log.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName); + Log_OC.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName); if (newDirectoryName.length() > 0) { String path; if (mCurrentDir == null) { @@ -1446,14 +1396,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements // Create directory path += newDirectoryName + OCFile.PATH_SEPARATOR; - Thread thread = new Thread(new DirectoryCreator(path, AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler())); - thread.start(); + RemoteOperation operation = new CreateFolderOperation(path, mCurrentDir.getFileId(), mStorageManager); + operation.execute( AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), + FileDisplayActivity.this, + FileDisplayActivity.this, + mHandler, + FileDisplayActivity.this); showDialog(DIALOG_SHORT_WAIT); } } } - + + private void requestForDownload() { Account account = AccountUtils.getCurrentOwnCloudAccount(this); if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {