X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/df4d0355f25795914dd0fcb9d53a9113da047c15..d8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6:/src/com/owncloud/android/files/FileOperationsHelper.java diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index e413cde6..c8cb2756 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -17,10 +17,9 @@ package com.owncloud.android.files; -import java.io.File; -import java.io.IOException; import org.apache.http.protocol.HTTP; +import android.accounts.Account; import android.accounts.AccountManager; import android.content.Intent; import android.net.Uri; @@ -30,15 +29,16 @@ import android.widget.Toast; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; +import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.services.OperationsService; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.dialog.ShareLinkToDialog; -import com.owncloud.android.utils.FileStorageUtils; -import com.owncloud.android.utils.Log_OC; /** * @@ -49,12 +49,19 @@ public class FileOperationsHelper { private static final String TAG = FileOperationsHelper.class.getName(); - private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG"; - - public final static int REQUEST_CODE_FILE_OPEN_HELPER = 100; + private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG"; + + protected FileActivity mFileActivity = null; + /// Identifier of operation in progress which result shouldn't be lost + private long mWaitingForOpId = Long.MAX_VALUE; - public void openFile(OCFile file, FileActivity callerActivity) { + public FileOperationsHelper(FileActivity fileActivity) { + mFileActivity = fileActivity; + } + + + public void openFile(OCFile file) { if (file != null) { String storagePath = file.getStoragePath(); String encodedStoragePath = WebdavUtils.encodePath(storagePath); @@ -75,28 +82,28 @@ public class FileOperationsHelper { Intent chooserIntent = null; if (intentForGuessedMimeType != null) { - chooserIntent = Intent.createChooser(intentForGuessedMimeType, callerActivity.getString(R.string.actionbar_open_with)); + chooserIntent = Intent.createChooser(intentForGuessedMimeType, mFileActivity.getString(R.string.actionbar_open_with)); } else { - chooserIntent = Intent.createChooser(intentForSavedMimeType, callerActivity.getString(R.string.actionbar_open_with)); + chooserIntent = Intent.createChooser(intentForSavedMimeType, mFileActivity.getString(R.string.actionbar_open_with)); } - callerActivity.startActivity(chooserIntent); + mFileActivity.startActivity(chooserIntent); } else { Log_OC.wtf(TAG, "Trying to open a NULL OCFile"); } } - - public void shareFileWithLink(OCFile file, FileActivity callerActivity) { + + public void shareFileWithLink(OCFile file) { - if (isSharedSupported(callerActivity)) { + if (isSharedSupported()) { if (file != null) { String link = "https://fake.url"; Intent intent = createShareWithLinkIntent(link); - String[] packagesToExclude = new String[] { callerActivity.getPackageName() }; + String[] packagesToExclude = new String[] { mFileActivity.getPackageName() }; DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intent, packagesToExclude, file); - chooserDialog.show(callerActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG); + chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG); } else { Log_OC.wtf(TAG, "Trying to share a NULL OCFile"); @@ -104,23 +111,23 @@ public class FileOperationsHelper { } else { // Show a Message - Toast t = Toast.makeText(callerActivity, callerActivity.getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG); + Toast t = Toast.makeText(mFileActivity, mFileActivity.getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG); t.show(); } } - public void shareFileWithLinkToApp(OCFile file, Intent sendIntent, FileActivity callerActivity) { + public void shareFileWithLinkToApp(OCFile file, Intent sendIntent) { if (file != null) { - callerActivity.showLoadingDialog(); + mFileActivity.showLoadingDialog(); - Intent service = new Intent(callerActivity, OperationsService.class); + Intent service = new Intent(mFileActivity, OperationsService.class); service.setAction(OperationsService.ACTION_CREATE_SHARE); - service.putExtra(OperationsService.EXTRA_ACCOUNT, callerActivity.getAccount()); + service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); service.putExtra(OperationsService.EXTRA_SEND_INTENT, sendIntent); - callerActivity.startService(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); } else { Log_OC.wtf(TAG, "Trying to open a NULL OCFile"); @@ -139,40 +146,38 @@ public class FileOperationsHelper { /** * @return 'True' if the server supports the Share API */ - public boolean isSharedSupported(FileActivity callerActivity) { - if (callerActivity.getAccount() != null) { - AccountManager accountManager = AccountManager.get(callerActivity); - - String version = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION); - String versionString = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION_STRING); - return (new OwnCloudVersion(version, versionString)).isSharedSupported(); - //return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API)); + public boolean isSharedSupported() { + if (mFileActivity.getAccount() != null) { + AccountManager accountManager = AccountManager.get(mFileActivity); + + String version = accountManager.getUserData(mFileActivity.getAccount(), Constants.KEY_OC_VERSION); + return (new OwnCloudVersion(version)).isSharedSupported(); } return false; } - public void unshareFileWithLink(OCFile file, FileActivity callerActivity) { + public void unshareFileWithLink(OCFile file) { - if (isSharedSupported(callerActivity)) { + if (isSharedSupported()) { // Unshare the file - Intent service = new Intent(callerActivity, OperationsService.class); + Intent service = new Intent(mFileActivity, OperationsService.class); service.setAction(OperationsService.ACTION_UNSHARE); - service.putExtra(OperationsService.EXTRA_ACCOUNT, callerActivity.getAccount()); + service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); - callerActivity.startService(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); - callerActivity.showLoadingDialog(); + mFileActivity.showLoadingDialog(); } else { // Show a Message - Toast t = Toast.makeText(callerActivity, callerActivity.getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG); + Toast t = Toast.makeText(mFileActivity, mFileActivity.getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG); t.show(); } } - public void sendDownloadedFile(OCFile file, FileActivity callerActivity) { + public void sendDownloadedFile(OCFile file) { if (file != null) { Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND); // set MimeType @@ -181,49 +186,156 @@ public class FileOperationsHelper { sendIntent.putExtra(Intent.ACTION_SEND, true); // Send Action // Show dialog, without the own app - String[] packagesToExclude = new String[] { callerActivity.getPackageName() }; + String[] packagesToExclude = new String[] { mFileActivity.getPackageName() }; DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file); - chooserDialog.show(callerActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG); + chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG); } else { Log_OC.wtf(TAG, "Trying to send a NULL OCFile"); } } - public void sendFileToApp(Intent sendIntent, FileActivity callerActivity) { - Uri filePath = sendIntent.getParcelableExtra(Intent.EXTRA_STREAM); - File file = new File(filePath.getPath()); - Log_OC.d(TAG, "FILE " + filePath.getPath()); - if (file.exists()) { - File folder = new File(FileStorageUtils.getTemporalPath(callerActivity.getAccount().name) + "/send"); - boolean success = true; - if (!folder.exists()) { - success = folder.mkdir(); - } - if (success) { - File tmpFile = new File(folder.getAbsolutePath()+ "/" + file.getName()); - try { - tmpFile.createNewFile(); - FileStorageUtils.copyFile(file, tmpFile); - } catch (IOException e) { - Log_OC.e(TAG, "An error occurred while it was trying to copy in a temporal folder " + e.getMessage()); - } - // Update Uri - Uri uri = Uri.fromFile(tmpFile); - sendIntent.removeExtra(Intent.EXTRA_STREAM); - sendIntent.putExtra(Intent.EXTRA_STREAM, uri); - callerActivity.startActivityForResult(sendIntent, REQUEST_CODE_FILE_OPEN_HELPER); - } + + public void syncFile(OCFile file) { + + if (!file.isFolder()){ + Intent intent = new Intent(mFileActivity, OperationsService.class); + intent.setAction(OperationsService.ACTION_SYNC_FILE); + intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); + intent.putExtra(OperationsService.EXTRA_SYNC_FILE_CONTENTS, true); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(intent); + mFileActivity.showLoadingDialog(); + } else { - // Show a Message - Toast t = Toast.makeText(callerActivity, callerActivity.getString(R.string.send_file_missing_file), Toast.LENGTH_LONG); - t.show(); - Log_OC.d(TAG, "Missing file"); + /* + // Add files recursivly + FileDataStorageManager storageManager = mFileActivity.getStorageManager(); + filesList.addAll(storageManager.getFolderContent(file)); + boolean newfiles; + do { + Vector tmpFolders = new Vector(); + for (OCFile tmpfile : filesList) { + if (tmpfile.isFolder()) { + tmpFolders.add(tmpfile); + } + } + if (tmpFolders.isEmpty()){ + newfiles = false; + }else { + for(OCFile tmpFolder : tmpFolders){ + filesList.remove(tmpFolder); + filesList.addAll(storageManager.getFolderContent(tmpFolder)); + } + newfiles = true; + } + } while(newfiles); + */ + Intent intent = new Intent(mFileActivity, OperationsService.class); + intent.setAction(OperationsService.ACTION_SYNC_FOLDER); + intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); + mFileActivity.startService(intent); // reevaluating: with or without Binder? + //mFileActivity.getOperationsServiceBinder().queueNewOperation(intent); } + } + + public void renameFile(OCFile file, String newFilename) { + // RenameFile + Intent service = new Intent(mFileActivity, OperationsService.class); + service.setAction(OperationsService.ACTION_RENAME); + service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); + service.putExtra(OperationsService.EXTRA_NEWNAME, newFilename); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); + + mFileActivity.showLoadingDialog(); + } + + public void removeFile(OCFile file, boolean onlyLocalCopy) { + // RemoveFile + Intent service = new Intent(mFileActivity, OperationsService.class); + service.setAction(OperationsService.ACTION_REMOVE); + service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); + service.putExtra(OperationsService.EXTRA_REMOVE_ONLY_LOCAL, onlyLocalCopy); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); + + mFileActivity.showLoadingDialog(); } + public void createFolder(String remotePath, boolean createFullPath) { + // Create Folder + Intent service = new Intent(mFileActivity, OperationsService.class); + service.setAction(OperationsService.ACTION_CREATE_FOLDER); + service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + service.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath); + service.putExtra(OperationsService.EXTRA_CREATE_FULL_PATH, createFullPath); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); + + mFileActivity.showLoadingDialog(); + } + + /** + * Cancel the transference in downloads (files/folders) and file uploads + * @param file OCFile + */ + public void cancelTransference(OCFile file) { + Account account = mFileActivity.getAccount(); + if (!file.isFolder()) { + FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder(); + FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder(); + if (downloaderBinder != null && file.isDownloading()) { + // Remove etag for parent, if file is a keep_in_sync + if (file.keepInSync()) { + OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId()); + parent.setEtag(""); + mFileActivity.getStorageManager().saveFile(parent); + } + + downloaderBinder.cancel(account, file); + + } else if (uploaderBinder != null && uploaderBinder.isUploading(account, file)) { + uploaderBinder.cancel(account, file); + } + } else { + Intent intent = new Intent(mFileActivity, OperationsService.class); + intent.setAction(OperationsService.ACTION_CANCEL_SYNC_FOLDER); + intent.putExtra(OperationsService.EXTRA_ACCOUNT, account); + intent.putExtra(OperationsService.EXTRA_FILE, file); + mFileActivity.startService(intent); + + } + } + + /** + * Start move file operation + * @param newfile File where it is going to be moved + * @param currentFile File with the previous info + */ + public void moveFile(OCFile newfile, OCFile currentFile) { + // Move files + Intent service = new Intent(mFileActivity, OperationsService.class); + service.setAction(OperationsService.ACTION_MOVE_FILE); + service.putExtra(OperationsService.EXTRA_NEW_PARENT_PATH, newfile.getRemotePath()); + service.putExtra(OperationsService.EXTRA_REMOTE_PATH, currentFile.getRemotePath()); + service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); + + mFileActivity.showLoadingDialog(); + } + + + public long getOpIdWaitingFor() { + return mWaitingForOpId; + } + + + public void setOpIdWaitingFor(long waitingForOpId) { + mWaitingForOpId = waitingForOpId; + } }