package com.owncloud.android.services;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
Pair<Target, RemoteOperation> itemToQueue = newOperation(intent);
if (itemToQueue != null) {
mSyncFolderHandler.add(account, remotePath, (SynchronizeFolderOperation)itemToQueue.second);
- sendBroadcastNewSyncFolder(account, remotePath);
+ mSyncFolderHandler.sendBroadcastNewSyncFolder(account, remotePath);
Message msg = mSyncFolderHandler.obtainMessage();
msg.arg1 = startId;
msg.obj = itemSyncKey;
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_FILE);
-
+ final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);
+ final OCFile file = intent.getParcelableExtra(EXTRA_FILE);
// Cancel operation
- mSyncFolderHandler.cancel(account,file);
+ new Thread(new Runnable() {
+ public void run() {
+ // Cancel the download
+ mSyncFolderHandler.cancel(account,file);
+ }
+ }).start();
+
} else {
Message msg = mOperationsHandler.obtainMessage();
msg.arg1 = startId;
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" );
* @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);
}
+ */
}
if (account == null || remotePath == null) return false;
String targetKey = buildRemoteName(account, remotePath);
synchronized (mPendingOperations) {
- return (mPendingOperations.containsKey(targetKey));
+ // TODO - this can be slow when synchronizing a big tree - need a better data structure
+ Iterator<String> it = mPendingOperations.keySet().iterator();
+ boolean found = false;
+ while (it.hasNext() && !found) {
+ found = it.next().startsWith(targetKey);
+ }
+ return found;
}
}
}
if (mCurrentSyncOperation != null) {
+ RemoteOperationResult result = null;
try {
mService.getContentResolver()
);
- mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
+ result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
} catch (AccountsException e) {
Log_OC.e(TAG, "Error while trying to get autorization", e);
synchronized(mPendingOperations) {
mPendingOperations.remove(syncKey);
}
+
+ mService.dispatchResultToOperationListeners(null, mCurrentSyncOperation, result);
+
+ sendBroadcastFinishedSyncFolder(account, remotePath, result.isSuccess());
}
}
}
mPendingOperations.putIfAbsent(syncKey,syncFolderOperation);
}
-
/**
- * Cancels a pending or current sync operation.
- *
+ * Cancels sync operations.
* @param account Owncloud account where the remote file is stored.
- * @param file File
+ * @param file File OCFile
*/
- public void cancel(Account account, OCFile file) {
+ public void cancel(Account account, OCFile file){
SynchronizeFolderOperation syncOperation = null;
+ String targetKey = buildRemoteName(account, file.getRemotePath());
+ ArrayList<String> keyItems = new ArrayList<String>();
synchronized (mPendingOperations) {
- syncOperation = mPendingOperations.remove(buildRemoteName(account, file.getRemotePath()));
- }
- if (syncOperation != null) {
- syncOperation.cancel();
+ if (file.isFolder()) {
+ Log_OC.d(TAG, "Canceling pending sync operations");
+ Iterator<String> it = mPendingOperations.keySet().iterator();
+ boolean found = false;
+ while (it.hasNext()) {
+ String keySyncOperation = it.next();
+ found = keySyncOperation.startsWith(targetKey);
+ if (found) {
+ keyItems.add(keySyncOperation);
+ }
+ }
+
+ } else {
+ // this is not really expected...
+ Log_OC.d(TAG, "Canceling sync operation");
+ keyItems.add(buildRemoteName(account, file.getRemotePath()));
+ }
+ for (String item: keyItems) {
+ syncOperation = mPendingOperations.remove(item);
+ if (syncOperation != null) {
+ syncOperation.cancel();
+ }
+ }
}
+ //sendBroadcastFinishedSyncFolder(account, file.getRemotePath());
+
/// 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
+ // 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);
private String buildRemoteName(Account account, String path) {
return account.name + path;
}
+
+
+ /**
+ * TODO review 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);
+ mService.sendStickyBroadcast(added);
+ }
+
+ /**
+ * TODO review this method when "folder synchronization" replaces "folder download"; this is a fast and ugly
+ * patch.
+ */
+ private void sendBroadcastFinishedSyncFolder(Account account, String remotePath, boolean success) {
+ Intent finished = new Intent(FileDownloader.getDownloadFinishMessage());
+ finished.putExtra(FileDownloader.ACCOUNT_NAME, account.name);
+ finished.putExtra(FileDownloader.EXTRA_REMOTE_PATH, remotePath);
+ finished.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + remotePath);
+ finished.putExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, success);
+ mService.sendStickyBroadcast(finished);
+ }
+
+
}
String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
Intent sendIntent = operationIntent.getParcelableExtra(EXTRA_SEND_INTENT);
if (remotePath.length() > 0) {
- operation = new CreateShareOperation(remotePath, ShareType.PUBLIC_LINK,
+ operation = new CreateShareOperation(OperationsService.this, remotePath, ShareType.PUBLIC_LINK,
"", false, "", 1, sendIntent);
}
/**
* Notifies the currently subscribed listeners about the end of an operation.
- *
+ *
* @param target Account or URL pointing to an OC server.
* @param operation Finished operation.
* @param result Result of the operation.
projects / pub / Android / ownCloud.git / blobdiff