Merge branch 'develop' into videoInstandUploads

[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 a4de86a..7536305 100644 (file)
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -52,7 +52,6 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;

-import android.util.Log;

 import android.util.Pair;
 
 public class OperationsService extends Service {
 import android.util.Pair;
 
 public class OperationsService extends Service {


@@ -89,18 +88,24 @@ public class OperationsService extends Service {
     private ConcurrentLinkedQueue<Pair<Target, RemoteOperation>> mPendingOperations = 
             new ConcurrentLinkedQueue<Pair<Target, RemoteOperation>>();
     
     private ConcurrentLinkedQueue<Pair<Target, RemoteOperation>> mPendingOperations = 
             new ConcurrentLinkedQueue<Pair<Target, RemoteOperation>>();
     

+    /*

     private ConcurrentMap<Integer, RemoteOperationResult> mOperationResults =
             new ConcurrentHashMap<Integer, RemoteOperationResult>();
     private ConcurrentMap<Integer, RemoteOperationResult> mOperationResults =
             new ConcurrentHashMap<Integer, RemoteOperationResult>();

+     */
+
+    private ConcurrentMap<Integer, Pair<RemoteOperation, RemoteOperationResult>> 
+        mUndispatchedFinishedOperations =
+            new ConcurrentHashMap<Integer, Pair<RemoteOperation, RemoteOperationResult>>();

     
     private static class Target {
         public Uri mServerUrl = null;
         public Account mAccount = null;
     
     private static class Target {
         public Uri mServerUrl = null;
         public Account mAccount = null;

-        public String mWebDavUrl = "";
-        public String mUsername = "";
-        public String mPassword = "";
-        public String mAuthToken = "";
+        public String mWebDavUrl = null;
+        public String mUsername = null;
+        public String mPassword = null;
+        public String mAuthToken = null;

         public boolean mFollowRedirects = true;
         public boolean mFollowRedirects = true;

-        public String mCookie = "";
+        public String mCookie = null;

         
         public Target(Account account, Uri serverUrl, String webdavUrl, String username, String password, String authToken,
                 boolean followRedirects, String cookie) {
         
         public Target(Account account, Uri serverUrl, String webdavUrl, String username, String password, String authToken,
                 boolean followRedirects, String cookie) {


@@ -149,21 +154,21 @@ 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.wtf(TAG, "onStartCommand init" );
+        //Log_OC.wtf(TAG, "onStartCommand init" );

         Message msg = mServiceHandler.obtainMessage();
         msg.arg1 = startId;
         mServiceHandler.sendMessage(msg);
         Message msg = mServiceHandler.obtainMessage();
         msg.arg1 = startId;
         mServiceHandler.sendMessage(msg);

-        Log.wtf(TAG, "onStartCommand end" );
+        //Log_OC.wtf(TAG, "onStartCommand end" );

         return START_NOT_STICKY;
     }
 
     @Override
     public void onDestroy() {
         return START_NOT_STICKY;
     }
 
     @Override
     public void onDestroy() {

-        Log.wtf(TAG, "onDestroy init" );
+        //Log_OC.wtf(TAG, "onDestroy init" );

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

-        Log.wtf(TAG, "Clear mOperationResults" );
-        mOperationResults.clear();
-        Log.wtf(TAG, "onDestroy end" );
+        //Log_OC.wtf(TAG, "Clear mUndispatchedFinisiedOperations" );
+        mUndispatchedFinishedOperations.clear();
+        //Log_OC.wtf(TAG, "onDestroy end" );

     }
 
 
     }
 
 


@@ -173,7 +178,7 @@ public class OperationsService extends Service {
      */
     @Override
     public IBinder onBind(Intent intent) {
      */
     @Override
     public IBinder onBind(Intent intent) {

-        Log.wtf(TAG, "onBind" );
+        //Log_OC.wtf(TAG, "onBind" );

         return mBinder;
     }
 
         return mBinder;
     }
 


@@ -256,9 +261,9 @@ public class OperationsService extends Service {
          * Creates and adds to the queue a new operation, as described by operationIntent
          * 
          * @param operationIntent       Intent describing a new operation to queue and execute.
          * Creates and adds to the queue a new operation, as described by operationIntent
          * 
          * @param operationIntent       Intent describing a new operation to queue and execute.

-         * @return                      Identifier of the operation created, or -1 if failed.
+         * @return                      Identifier of the operation created, or null if failed.

          */
          */

-        public int newOperation(Intent operationIntent) {
+        public long newOperation(Intent operationIntent) {

             RemoteOperation operation = null;
             Target target = null;
             try {
             RemoteOperation operation = null;
             Target target = null;
             try {


@@ -279,12 +284,12 @@ public class OperationsService extends Service {
                     target = new Target(
                             account, 
                             (serverUrl == null) ? null : Uri.parse(serverUrl),
                     target = new Target(
                             account, 
                             (serverUrl == null) ? null : Uri.parse(serverUrl),

-                            ((webDavPath == null) || (serverUrl == null)) ? "" : webDavUrl,
-                            (username == null) ? "" : username,
-                            (password == null) ? "" : password,
-                            (authToken == null) ? "" : authToken,
+                            ((webDavPath == null) || (serverUrl == null)) ? null : webDavUrl,
+                            username,
+                            password,
+                            authToken,

                             followRedirects,
                             followRedirects,

-                            (cookie == null) ? "" : cookie
+                            cookie

                     );
                     
                     String action = operationIntent.getAction();
                     );
                     
                     String action = operationIntent.getAction();


@@ -341,16 +346,25 @@ public class OperationsService extends Service {
             if (operation != null) {
                 mPendingOperations.add(new Pair<Target , RemoteOperation>(target, operation));
                 startService(new Intent(OperationsService.this, OperationsService.class));
             if (operation != null) {
                 mPendingOperations.add(new Pair<Target , RemoteOperation>(target, operation));
                 startService(new Intent(OperationsService.this, OperationsService.class));

+                //Log_OC.wtf(TAG, "New operation added, opId: " + operation.hashCode());
+                // better id than hash? ; should be good enough by the time being

                 return operation.hashCode();
                 
             } else {
                 return operation.hashCode();
                 
             } else {

-                return -1;
+                //Log_OC.wtf(TAG, "New operation failed, returned Long.MAX_VALUE");
+                return Long.MAX_VALUE;

             }
         }
 
             }
         }
 

-        public RemoteOperationResult getOperationResultIfFinished(int operationId) {
-            Log_OC.wtf(TAG, "Searching result for operation with id " + operationId);
-            return mOperationResults.remove(operationId);
+        public void dispatchResultIfFinished(int operationId, OnRemoteOperationListener listener) {
+            Pair<RemoteOperation, RemoteOperationResult> undispatched = 
+                    mUndispatchedFinishedOperations.remove(operationId);
+            if (undispatched != null) {
+                listener.onRemoteOperationFinish(undispatched.first, undispatched.second);
+                //Log_OC.wtf(TAG, "Sending callback later");
+            } else {
+                //Log_OC.wtf(TAG, "Not finished yet");
+            }

         }
 
     }
         }
 
     }


@@ -385,7 +399,7 @@ public class OperationsService extends Service {
      */
     private void nextOperation() {
         
      */
     private void nextOperation() {
         

-        Log.wtf(TAG, "nextOperation init" );
+        //Log_OC.wtf(TAG, "nextOperation init" );

         
         Pair<Target, RemoteOperation> next = null;
         synchronized(mPendingOperations) {
         
         Pair<Target, RemoteOperation> next = null;
         synchronized(mPendingOperations) {


@@ -406,14 +420,14 @@ public class OperationsService extends Service {
                     } else {
                         mOwnCloudClient = OwnCloudClientFactory.createOwnCloudClient(mLastTarget.mServerUrl, getApplicationContext(), 
                                 mLastTarget.mFollowRedirects);    // this is not good enough
                     } else {
                         mOwnCloudClient = OwnCloudClientFactory.createOwnCloudClient(mLastTarget.mServerUrl, getApplicationContext(), 
                                 mLastTarget.mFollowRedirects);    // this is not good enough

-                        if (mLastTarget.mWebDavUrl != "") {
+                        if (mLastTarget.mWebDavUrl != null) {

                             mOwnCloudClient.setWebdavUri(Uri.parse(mLastTarget.mWebDavUrl));
                         }
                             mOwnCloudClient.setWebdavUri(Uri.parse(mLastTarget.mWebDavUrl));
                         }

-                        if (mLastTarget.mUsername != "" && mLastTarget.mPassword != "") {
+                        if (mLastTarget.mUsername != null && mLastTarget.mPassword != null) {

                             mOwnCloudClient.setBasicCredentials(mLastTarget.mUsername, mLastTarget.mPassword);
                             mOwnCloudClient.setBasicCredentials(mLastTarget.mUsername, mLastTarget.mPassword);

-                        } else if (mLastTarget.mAuthToken != "") {
+                        } else if (mLastTarget.mAuthToken != null) {

                             mOwnCloudClient.setBearerCredentials(mLastTarget.mAuthToken);
                             mOwnCloudClient.setBearerCredentials(mLastTarget.mAuthToken);

-                        } else if (mLastTarget.mCookie != "") {
+                        } else if (mLastTarget.mCookie != null) {

                             mOwnCloudClient.setSsoSessionCookie(mLastTarget.mCookie);
                         }
                         mStorageManager = null;
                             mOwnCloudClient.setSsoSessionCookie(mLastTarget.mCookie);
                         }
                         mStorageManager = null;


@@ -457,7 +471,7 @@ public class OperationsService extends Service {
             }
             
             //sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);
             }
             
             //sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);

-            dispatchOperationListeners(mLastTarget, mCurrentOperation, result);
+            dispatchResultToOperationListeners(mLastTarget, mCurrentOperation, result);

         }
     }
 
         }
     }
 


@@ -515,7 +529,7 @@ public class OperationsService extends Service {
      * @param operation         Finished operation.
      * @param result            Result of the operation.
      */
      * @param operation         Finished operation.
      * @param result            Result of the operation.
      */

-    private void dispatchOperationListeners(
+    private void dispatchResultToOperationListeners(

             Target target, final RemoteOperation operation, final RemoteOperationResult result) {
         int count = 0;
         Iterator<OnRemoteOperationListener> listeners = mBinder.mBoundListeners.keySet().iterator();
             Target target, final RemoteOperation operation, final RemoteOperationResult result) {
         int count = 0;
         Iterator<OnRemoteOperationListener> listeners = mBinder.mBoundListeners.keySet().iterator();


@@ -533,7 +547,10 @@ public class OperationsService extends Service {
             }
         }
         if (count == 0) {
             }
         }
         if (count == 0) {

-            mOperationResults.put(operation.hashCode(), result);
+            //mOperationResults.put(operation.hashCode(), result);
+            Pair<RemoteOperation, RemoteOperationResult> undispatched = 
+                    new Pair<RemoteOperation, RemoteOperationResult>(operation, result);
+            mUndispatchedFinishedOperations.put(operation.hashCode(), undispatched);

         }
         Log_OC.d(TAG, "Called " + count + " listeners");
     }
         }
         Log_OC.d(TAG, "Called " + count + " listeners");
     }