X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/407f64f5e062cbd59b82043406923f082c6fa911..cc77ea37de47ecf8d0261978aa9de924c917deec:/src/com/owncloud/android/services/OperationsService.java diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index d3b6df34..385306dd 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -27,6 +27,7 @@ import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.lib.common.OwnCloudAccount; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; @@ -51,6 +52,7 @@ 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.utils.FileStorageUtils; import android.accounts.Account; import android.accounts.AccountsException; @@ -83,7 +85,8 @@ public class OperationsService extends Service { public static final String EXTRA_SYNC_FILE_CONTENTS = "SYNC_FILE_CONTENTS"; public static final String EXTRA_RESULT = "RESULT"; public static final String EXTRA_NEW_PARENT_PATH = "NEW_PARENT_PATH"; - + public static final String EXTRA_FILE = "FILE"; + // TODO review if ALL OF THEM are necessary public static final String EXTRA_SUCCESS_IF_ABSENT = "SUCCESS_IF_ABSENT"; public static final String EXTRA_USERNAME = "USERNAME"; @@ -172,24 +175,26 @@ public class OperationsService extends Service { return START_NOT_STICKY; } Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); - OCFile file = intent.getParcelableExtra(EXTRA_REMOTE_PATH); - Pair itemSyncKey = new Pair(account, file); + String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH); + + Pair itemSyncKey = new Pair(account, remotePath); Pair itemToQueue = newOperation(intent); if (itemToQueue != null) { - mSyncFolderHandler.add(account, file, (SynchronizeFolderOperation)itemToQueue.second); + mSyncFolderHandler.add(account, remotePath, (SynchronizeFolderOperation)itemToQueue.second); + sendBroadcastNewSyncFolder(account, remotePath); Message msg = mSyncFolderHandler.obtainMessage(); msg.arg1 = startId; msg.obj = itemSyncKey; mSyncFolderHandler.sendMessage(msg); } } else if (ACTION_CANCEL_SYNC_FOLDER.equals(intent.getAction())) { - if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_REMOTE_PATH)) { + if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_FILE)) { Log_OC.e(TAG, "Not enough information provided in intent"); return START_NOT_STICKY; } Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); - OCFile file = intent.getParcelableExtra(EXTRA_REMOTE_PATH); + OCFile file = intent.getParcelableExtra(EXTRA_FILE); // Cancel operation mSyncFolderHandler.cancel(account,file); @@ -202,6 +207,19 @@ public class OperationsService extends Service { return START_NOT_STICKY; } + /** + * TODO remove this method when "folder synchronization" replaces "folder download"; this is a fast and ugly + * patch. + */ + private void sendBroadcastNewSyncFolder(Account account, String remotePath) { + Intent added = new Intent(FileDownloader.getDownloadAddedMessage()); + added.putExtra(FileDownloader.ACCOUNT_NAME, account.name); + added.putExtra(FileDownloader.EXTRA_REMOTE_PATH, remotePath); + added.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + remotePath); + sendStickyBroadcast(added); + } + + @Override public void onDestroy() { //Log_OC.wtf(TAG, "onDestroy init" ); @@ -358,6 +376,19 @@ public class OperationsService extends Service { //Log_OC.wtf(TAG, "Not finished yet"); } } + + + /** + * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download. + * + * If 'file' is a directory, returns 'true' if some of its descendant files is downloading or waiting to download. + * + * @param account ownCloud account where the remote file is stored. + * @param file A file that could be affected + */ + public boolean isSynchronizing(Account account, String remotePath) { + return mSyncFolderHandler.isSynchronizing(account, remotePath); + } } @@ -375,7 +406,6 @@ public class OperationsService extends Service { private ConcurrentMap mPendingOperations = new ConcurrentHashMap(); - private RemoteOperation mCurrentOperation = null; private OwnCloudClient mOwnCloudClient = null; private FileDataStorageManager mStorageManager; private SynchronizeFolderOperation mCurrentSyncOperation; @@ -389,10 +419,20 @@ public class OperationsService extends Service { mService = service; } + + public boolean isSynchronizing(Account account, String remotePath) { + if (account == null || remotePath == null) return false; + String targetKey = buildRemoteName(account, remotePath); + synchronized (mPendingOperations) { + return (mPendingOperations.containsKey(targetKey)); + } + } + + @Override public void handleMessage(Message msg) { - Pair itemSyncKey = (Pair) msg.obj; - nextOperation(itemSyncKey.first,itemSyncKey.second); + Pair itemSyncKey = (Pair) msg.obj; + doOperation(itemSyncKey.first, itemSyncKey.second); mService.stopSelf(msg.arg1); } @@ -400,9 +440,9 @@ public class OperationsService extends Service { /** * Performs the next operation in the queue */ - private void nextOperation(Account account, OCFile file) { + private void doOperation(Account account, String remotePath) { - String syncKey = buildRemoteName(account,file); + String syncKey = buildRemoteName(account,remotePath); synchronized(mPendingOperations) { mCurrentSyncOperation = mPendingOperations.get(syncKey); @@ -410,7 +450,6 @@ public class OperationsService extends Service { if (mCurrentSyncOperation != null) { - RemoteOperationResult operationResult = null; try { OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService); @@ -421,61 +460,58 @@ public class OperationsService extends Service { mService.getContentResolver() ); - - /// perform the operation - if (mCurrentOperation instanceof SyncOperation) { - operationResult = ((SyncOperation)mCurrentOperation).execute(mOwnCloudClient, mStorageManager); - } else { - operationResult = mCurrentOperation.execute(mOwnCloudClient); - } + mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager); } catch (AccountsException e) { Log_OC.e(TAG, "Error while trying to get autorization", e); - operationResult = new RemoteOperationResult(e); } catch (IOException e) { Log_OC.e(TAG, "Error while trying to get autorization", e); - operationResult = new RemoteOperationResult(e); - } finally { synchronized(mPendingOperations) { mPendingOperations.remove(syncKey); } } - - /// TODO notify operation result if needed - } } - public void add(Account account, OCFile file, SynchronizeFolderOperation syncFolderOperation){ - String syncKey = buildRemoteName(account,file); + public void add(Account account, String remotePath, SynchronizeFolderOperation syncFolderOperation){ + String syncKey = buildRemoteName(account,remotePath); mPendingOperations.putIfAbsent(syncKey,syncFolderOperation); } + /** * Cancels a pending or current sync operation. * * @param account Owncloud account where the remote file is stored. - * @param file A file in the queue of pending downloads + * @param file File */ public void cancel(Account account, OCFile file) { SynchronizeFolderOperation syncOperation = null; synchronized (mPendingOperations) { - syncOperation = mPendingOperations.remove(buildRemoteName(account, file)); + syncOperation = mPendingOperations.remove(buildRemoteName(account, file.getRemotePath())); } if (syncOperation != null) { syncOperation.cancel(); } + + /// cancellation of download needs to be done separately in any case; a SynchronizeFolderOperation + // may finish much sooner than the real download of the files in the folder + Intent intent = new Intent(mService, FileDownloader.class); + intent.setAction(FileDownloader.ACTION_CANCEL_FILE_DOWNLOAD); + intent.putExtra(FileDownloader.EXTRA_ACCOUNT, account); + intent.putExtra(FileDownloader.EXTRA_FILE, file); + mService.startService(intent); } /** * Builds a key from the account and file to download * * @param account Account where the file to download is stored - * @param file File to download + * @param path File path */ - private String buildRemoteName(Account account, OCFile file) { - return account.name + file.getRemotePath(); + private String buildRemoteName(Account account, String path) { + return account.name + path; } }