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";
public static final String ACTION_CREATE_FOLDER = "CREATE_FOLDER";
public static final String ACTION_SYNC_FILE = "SYNC_FILE";
public static final String ACTION_SYNC_FOLDER = "SYNC_FOLDER"; // for the moment, just to download
- public static final String ACTION_CANCEL_SYNC_FOLDER = "CANCEL_SYNC_FOLDER"; // for the moment, just to download
+ //public static final String ACTION_CANCEL_SYNC_FOLDER = "CANCEL_SYNC_FOLDER"; // for the moment, just to download
public static final String ACTION_MOVE_FILE = "MOVE_FILE";
public static final String ACTION_OPERATION_ADDED = OperationsService.class.getName() + ".OPERATION_ADDED";
@Override
public void onCreate() {
super.onCreate();
+ Log_OC.d(TAG, "Creating service");
+
/// First worker thread for most of operations
HandlerThread thread = new HandlerThread("Operations thread", Process.THREAD_PRIORITY_BACKGROUND);
thread.start();
*/
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- // WIP: for the moment, only SYNC_FOLDER and CANCEL_SYNC_FOLDER is expected here;
+ Log_OC.d(TAG, "Starting command with id " + startId);
+
+ // WIP: for the moment, only SYNC_FOLDER is expected here;
// the rest of the operations are requested through the Binder
if (ACTION_SYNC_FOLDER.equals(intent.getAction())) {
+
if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_REMOTE_PATH)) {
Log_OC.e(TAG, "Not enough information provided in intent");
return START_NOT_STICKY;
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)) {
- Log_OC.e(TAG, "Not enough information provided in intent");
- return START_NOT_STICKY;
- }
- Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);
- String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);
- // Cancel operation
- mSyncFolderHandler.cancel(account,remotePath);
} else {
Message msg = mOperationsHandler.obtainMessage();
msg.arg1 = startId;
@Override
public void onDestroy() {
- //Log_OC.wtf(TAG, "onDestroy init" );
+ Log_OC.v(TAG, "Destroying service" );
// Saving cookies
try {
OwnCloudClientManagerFactory.getDefaultSingleton().
e.printStackTrace();
}
- //Log_OC.wtf(TAG, "Clear mUndispatchedFinisiedOperations" );
mUndispatchedFinishedOperations.clear();
-
- //Log_OC.wtf(TAG, "onDestroy end" );
+
+ mOperationsBinder = null;
+
+ mOperationsHandler.getLooper().quit();
+ mOperationsHandler = null;
+
+ mSyncFolderHandler.getLooper().quit();
+ mSyncFolderHandler = null;
+
super.onDestroy();
}
new ConcurrentHashMap<OnRemoteOperationListener, Handler>();
private ServiceHandler mServiceHandler = null;
-
-
+
public OperationsServiceBinder(ServiceHandler serviceHandler) {
mServiceHandler = serviceHandler;
}
/**
- * Cancels an operation
+ * Cancels a pending or current synchronization.
*
- * TODO
+ * @param account ownCloud account where the remote folder is stored.
+ * @param file A folder in the queue of pending synchronizations
*/
- public void cancel() {
- // TODO
+ public void cancel(Account account, OCFile file) {
+ mSyncFolderHandler.cancel(account, file);
}
-
-
+
+
public void clearListeners() {
mBoundListeners.clear();
//Log_OC.wtf(TAG, "Not finished yet");
}
}
-
- }
-
-
- /**
- * SyncFolder worker. Performs the pending operations in the order they were requested.
- *
- * Created with the Looper of a new thread, started in {@link OperationsService#onCreate()}.
- */
- private static class SyncFolderHandler extends Handler {
-
- // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak
-
- OperationsService mService;
-
- private ConcurrentMap<String,SynchronizeFolderOperation> mPendingOperations =
- new ConcurrentHashMap<String,SynchronizeFolderOperation>();
- private OwnCloudClient mOwnCloudClient = null;
- private FileDataStorageManager mStorageManager;
- private SynchronizeFolderOperation mCurrentSyncOperation;
-
-
- public SyncFolderHandler(Looper looper, OperationsService service) {
- super(looper);
- if (service == null) {
- throw new IllegalArgumentException("Received invalid NULL in parameter 'service'");
- }
- mService = service;
- }
-
- @Override
- public void handleMessage(Message msg) {
- Pair<Account, String> itemSyncKey = (Pair<Account, String>) msg.obj;
- doOperation(itemSyncKey.first, itemSyncKey.second);
- mService.stopSelf(msg.arg1);
- }
-
-
- /**
- * Performs the next operation in the queue
- */
- private void doOperation(Account account, String remotePath) {
-
- String syncKey = buildRemoteName(account,remotePath);
-
- synchronized(mPendingOperations) {
- mCurrentSyncOperation = mPendingOperations.get(syncKey);
- }
-
- if (mCurrentSyncOperation != null) {
-
- try {
-
- OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService);
- mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
- getClientFor(ocAccount, mService);
- mStorageManager = new FileDataStorageManager(
- account,
- mService.getContentResolver()
- );
-
- mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
-
- } catch (AccountsException e) {
- Log_OC.e(TAG, "Error while trying to get autorization", e);
- } catch (IOException e) {
- Log_OC.e(TAG, "Error while trying to get autorization", e);
- } finally {
- synchronized(mPendingOperations) {
- mPendingOperations.remove(syncKey);
- }
- }
- }
- }
-
- 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 remotePath A remote file path
+ * 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 remotePath Path of the folder to check if something is synchronizing / downloading / uploading
+ * inside.
*/
- public void cancel(Account account, String remotePath) {
- SynchronizeFolderOperation syncOperation = null;
- synchronized (mPendingOperations) {
- syncOperation = mPendingOperations.remove(buildRemoteName(account, remotePath));
- }
- if (syncOperation != null) {
- syncOperation.cancel();
- }
+ public boolean isSynchronizing(Account account, String remotePath) {
+ return mSyncFolderHandler.isSynchronizing(account, remotePath);
}
- /**
- * Builds a key from the account and file to download
- *
- * @param account Account where the file to download is stored
- * @param path File path
- */
- private String buildRemoteName(Account account, String path) {
- return account.name + path;
- }
}
- /**
+ /**
* Operations worker. Performs the pending operations in the order they were requested.
*
* Created with the Looper of a new thread, started in {@link OperationsService#onCreate()}.
@Override
public void handleMessage(Message msg) {
nextOperation();
+ Log_OC.d(TAG, "Stopping after command with id " + msg.arg1);
mService.stopSelf(msg.arg1);
}
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.
*/
- private void dispatchResultToOperationListeners(
+ protected void dispatchResultToOperationListeners(
Target target, final RemoteOperation operation, final RemoteOperationResult result) {
int count = 0;
Iterator<OnRemoteOperationListener> listeners = mOperationsBinder.mBoundListeners.keySet().iterator();
projects / pub / Android / ownCloud.git / blobdiff