Merge branch 'master' into develop

[pub/Android/ownCloud.git] / 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 02462df..581a686 100644 (file)
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentMap;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 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.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;


@@ -82,7 +83,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_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";
     // 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";


@@ -101,6 +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_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_MOVE_FILE = "MOVE_FILE";
     
     public static final String ACTION_OPERATION_ADDED = OperationsService.class.getName() + ".OPERATION_ADDED";
     public static final String ACTION_MOVE_FILE = "MOVE_FILE";
     
     public static final String ACTION_OPERATION_ADDED = OperationsService.class.getName() + ".OPERATION_ADDED";


@@ -133,7 +136,7 @@ public class OperationsService extends Service {
     private ServiceHandler mOperationsHandler;
     private OperationsServiceBinder mOperationsBinder;
     
     private ServiceHandler mOperationsHandler;
     private OperationsServiceBinder mOperationsBinder;
     

-    private ServiceHandler mSyncFolderHandler;
+    private SyncFolderHandler mSyncFolderHandler;

     
     /**
      * Service initialization
     
     /**
      * Service initialization


@@ -141,6 +144,8 @@ public class OperationsService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
     @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();
         /// First worker thread for most of operations 
         HandlerThread thread = new HandlerThread("Operations thread", Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();


@@ -150,7 +155,7 @@ public class OperationsService extends Service {
         /// Separated worker thread for download of folders (WIP)
         thread = new HandlerThread("Syncfolder thread", Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
         /// Separated worker thread for download of folders (WIP)
         thread = new HandlerThread("Syncfolder thread", Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();

-        mSyncFolderHandler = new ServiceHandler(thread.getLooper(), this);
+        mSyncFolderHandler = new SyncFolderHandler(thread.getLooper(), this);

     }
 
     
     }
 
     


@@ -162,17 +167,30 @@ public class OperationsService extends Service {
      */
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
      */
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {

+        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 (ACTION_SYNC_FOLDER.equals(intent.getAction())) {

-            // WIP: for the moment, only SYNC_FOLDER is expected here; the rest of the operations are requested through
-            // the Binder
+
+            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);
+
+            Pair<Account, String> itemSyncKey =  new Pair<Account , String>(account, remotePath);
+

             Pair<Target, RemoteOperation> itemToQueue = newOperation(intent);
             if (itemToQueue != null) {
             Pair<Target, RemoteOperation> itemToQueue = newOperation(intent);
             if (itemToQueue != null) {

-                mSyncFolderHandler.mPendingOperations.add(itemToQueue);
+                mSyncFolderHandler.add(account, remotePath, (SynchronizeFolderOperation)itemToQueue.second);

                 Message msg = mSyncFolderHandler.obtainMessage();
                 msg.arg1 = startId;
                 Message msg = mSyncFolderHandler.obtainMessage();
                 msg.arg1 = startId;

+                msg.obj = itemSyncKey;

                 mSyncFolderHandler.sendMessage(msg);
             }
                 mSyncFolderHandler.sendMessage(msg);
             }

-            
+

         } else {
             Message msg = mOperationsHandler.obtainMessage();
             msg.arg1 = startId;
         } else {
             Message msg = mOperationsHandler.obtainMessage();
             msg.arg1 = startId;


@@ -184,7 +202,7 @@ public class OperationsService extends Service {
 
     @Override
     public void onDestroy() {
 
     @Override
     public void onDestroy() {

-        //Log_OC.wtf(TAG, "onDestroy init" );
+        Log_OC.v(TAG, "Destroying service" );

         // Saving cookies
         try {
             OwnCloudClientManagerFactory.getDefaultSingleton().
         // Saving cookies
         try {
             OwnCloudClientManagerFactory.getDefaultSingleton().


@@ -201,14 +219,19 @@ public class OperationsService extends Service {
             e.printStackTrace();
         }
         
             e.printStackTrace();
         }
         

-        //Log_OC.wtf(TAG, "Clear mUndispatchedFinisiedOperations" );

         mUndispatchedFinishedOperations.clear();
         mUndispatchedFinishedOperations.clear();

-        
-        //Log_OC.wtf(TAG, "onDestroy end" );
+
+        mOperationsBinder = null;
+
+        mOperationsHandler.getLooper().quit();
+        mOperationsHandler = null;
+
+        mSyncFolderHandler.getLooper().quit();
+        mSyncFolderHandler = null;
+

         super.onDestroy();
     }
 
         super.onDestroy();
     }
 

-

     /**
      * Provides a binder object that clients can use to perform actions on the queue of operations, 
      * except the addition of new operations. 
     /**
      * Provides a binder object that clients can use to perform actions on the queue of operations, 
      * except the addition of new operations. 


@@ -229,7 +252,7 @@ public class OperationsService extends Service {
         return false;   // not accepting rebinding (default behaviour)
     }
 
         return false;   // not accepting rebinding (default behaviour)
     }
 

-    
+

     /**
      *  Binder to let client components to perform actions on the queue of operations.
      * 
     /**
      *  Binder to let client components to perform actions on the queue of operations.
      * 


@@ -244,23 +267,23 @@ public class OperationsService extends Service {
                 new ConcurrentHashMap<OnRemoteOperationListener, Handler>();
         
         private ServiceHandler mServiceHandler = null;   
                 new ConcurrentHashMap<OnRemoteOperationListener, Handler>();
         
         private ServiceHandler mServiceHandler = null;   

-        
-        
+

         public OperationsServiceBinder(ServiceHandler serviceHandler) {
             mServiceHandler = serviceHandler;
         }
 
 
         /**
         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();
         public void clearListeners() {
             
             mBoundListeners.clear();


@@ -339,11 +362,27 @@ public class OperationsService extends Service {
                 //Log_OC.wtf(TAG, "Not finished yet");
             }
         }
                 //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 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);
+        }

 
     }
 
     }

-    
-    
-    /** 
+
+
+    /**

      * 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()}. 
      * 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()}. 


@@ -355,7 +394,7 @@ public class OperationsService extends Service {
         OperationsService mService;
         
         
         OperationsService mService;
         
         

-        private ConcurrentLinkedQueue<Pair<Target, RemoteOperation>> mPendingOperations = 
+        private ConcurrentLinkedQueue<Pair<Target, RemoteOperation>> mPendingOperations =

                 new ConcurrentLinkedQueue<Pair<Target, RemoteOperation>>();
         private RemoteOperation mCurrentOperation = null;
         private Target mLastTarget = null;
                 new ConcurrentLinkedQueue<Pair<Target, RemoteOperation>>();
         private RemoteOperation mCurrentOperation = null;
         private Target mLastTarget = null;


@@ -374,6 +413,7 @@ public class OperationsService extends Service {
         @Override
         public void handleMessage(Message msg) {
             nextOperation();
         @Override
         public void handleMessage(Message msg) {
             nextOperation();

+            Log_OC.d(TAG, "Stopping after command with id " + msg.arg1);

             mService.stopSelf(msg.arg1);
         }
         
             mService.stopSelf(msg.arg1);
         }
         


@@ -515,7 +555,7 @@ public class OperationsService extends Service {
                     String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
                     Intent sendIntent = operationIntent.getParcelableExtra(EXTRA_SEND_INTENT);
                     if (remotePath.length() > 0) {
                     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);
                     }
                     
                                 "", false, "", 1, sendIntent);
                     }
                     


@@ -657,12 +697,12 @@ public class OperationsService extends Service {
     
     /**
      * Notifies the currently subscribed listeners about the end of an operation.
     
     /**
      * 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.
      */
      * @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();
             Target target, final RemoteOperation operation, final RemoteOperationResult result) {
         int count = 0;
         Iterator<OnRemoteOperationListener> listeners = mOperationsBinder.mBoundListeners.keySet().iterator();


@@ -687,6 +727,4 @@ public class OperationsService extends Service {
         }
         Log_OC.d(TAG, "Called " + count + " listeners");
     }
         }
         Log_OC.d(TAG, "Called " + count + " listeners");
     }

-    
-

 }
 }