X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d05d5ffe1a5b7a4f470afa541515a0b9c7eb9f59..ec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7:/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 2b51660d..581a686d 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -27,7 +27,6 @@ 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; @@ -52,7 +51,6 @@ 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; @@ -105,7 +103,7 @@ public class OperationsService extends Service { 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"; @@ -146,6 +144,8 @@ public class OperationsService extends Service { @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(); @@ -167,9 +167,12 @@ public class OperationsService extends Service { */ @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; @@ -182,22 +185,12 @@ public class OperationsService extends Service { Pair itemToQueue = newOperation(intent); if (itemToQueue != null) { 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_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_FILE); - // Cancel operation - mSyncFolderHandler.cancel(account,file); } else { Message msg = mOperationsHandler.obtainMessage(); msg.arg1 = startId; @@ -207,22 +200,9 @@ 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" ); + Log_OC.v(TAG, "Destroying service" ); // Saving cookies try { OwnCloudClientManagerFactory.getDefaultSingleton(). @@ -239,10 +219,16 @@ public class OperationsService extends Service { 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(); } @@ -281,23 +267,23 @@ public class OperationsService extends Service { new ConcurrentHashMap(); 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(); @@ -379,12 +365,15 @@ public class OperationsService extends Service { /** - * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download. + * 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. + * 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 + * @param remotePath Path of the folder to check if something is synchronizing / downloading / uploading + * inside. */ public boolean isSynchronizing(Account account, String remotePath) { return mSyncFolderHandler.isSynchronizing(account, remotePath); @@ -394,132 +383,6 @@ public class OperationsService extends Service { /** - * 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 mPendingOperations = - new ConcurrentHashMap(); - 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; - } - - - 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; - 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) { - RemoteOperationResult result = null; - - try { - - OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService); - mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService); - mStorageManager = new FileDataStorageManager( - account, - mService.getContentResolver() - ); - - result = 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); - } - - mService.dispatchResultToOperationListeners(null, mCurrentSyncOperation, result); - } - } - } - - 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 File - */ - public void cancel(Account account, OCFile file) { - SynchronizeFolderOperation syncOperation = null; - synchronized (mPendingOperations) { - 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 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()}. @@ -550,6 +413,7 @@ public class OperationsService extends Service { @Override public void handleMessage(Message msg) { nextOperation(); + Log_OC.d(TAG, "Stopping after command with id " + msg.arg1); mService.stopSelf(msg.arg1); } @@ -838,7 +702,7 @@ public class OperationsService extends Service { * @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 listeners = mOperationsBinder.mBoundListeners.keySet().iterator();