OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file

[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 6925cb0..80caea7 100644 (file)
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -18,24 +18,21 @@
 package com.owncloud.android.services;
 
 import java.io.IOException;
 package com.owncloud.android.services;
 
 import java.io.IOException;

-import java.util.HashSet;
+import java.util.HashMap;

 import java.util.Iterator;
 import java.util.Iterator;

-import java.util.Set;
+import java.util.Map;

 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;

-
-import com.owncloud.android.lib.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.network.OwnCloudClientFactory;
-import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.operations.common.SyncOperation;

 import com.owncloud.android.operations.CreateShareOperation;
 import com.owncloud.android.operations.CreateShareOperation;

-import com.owncloud.android.operations.GetSharesOperation;

 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.operations.UnshareLinkOperation;

-import com.owncloud.android.operations.common.SyncOperation;
-import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
-import com.owncloud.android.lib.operations.common.RemoteOperation;
-import com.owncloud.android.lib.operations.common.RemoteOperationResult;
-import com.owncloud.android.lib.operations.common.ShareType;

 import com.owncloud.android.utils.Log_OC;
 
 import android.accounts.Account;
 import com.owncloud.android.utils.Log_OC;
 
 import android.accounts.Account;


@@ -125,24 +122,25 @@ public class OperationsService extends Service {
             RemoteOperation operation = null;
             
             String action = intent.getAction();
             RemoteOperation operation = null;
             
             String action = intent.getAction();

-            if (action == ACTION_CREATE_SHARE) {  // Create Share
+            if (action.equals(ACTION_CREATE_SHARE)) {  // Create Share

                 String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);
                 Intent sendIntent = intent.getParcelableExtra(EXTRA_SEND_INTENT);
                 if (remotePath.length() > 0) {
                     operation = new CreateShareOperation(remotePath, ShareType.PUBLIC_LINK, 
                             "", false, "", 1, sendIntent);
                 }
                 String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);
                 Intent sendIntent = intent.getParcelableExtra(EXTRA_SEND_INTENT);
                 if (remotePath.length() > 0) {
                     operation = new CreateShareOperation(remotePath, ShareType.PUBLIC_LINK, 
                             "", false, "", 1, sendIntent);
                 }

-            } else if (action == ACTION_UNSHARE) {  // Unshare file
+            } else if (action.equals(ACTION_UNSHARE)) {  // Unshare file

                 String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);
                 if (remotePath.length() > 0) {
                     operation = new UnshareLinkOperation(remotePath, this.getApplicationContext());
                 }
             } else {
                 String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);
                 if (remotePath.length() > 0) {
                     operation = new UnshareLinkOperation(remotePath, this.getApplicationContext());
                 }
             } else {

-                operation = new GetSharesOperation();
+                // nothing we are going to handle
+                return START_NOT_STICKY;

             }
             
             mPendingOperations.add(new Pair<Target , RemoteOperation>(target, operation));
             }
             
             mPendingOperations.add(new Pair<Target , RemoteOperation>(target, operation));

-            sendBroadcastNewOperation(target, operation);
+            //sendBroadcastNewOperation(target, operation);

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


@@ -187,7 +185,7 @@ public class OperationsService extends Service {
         /** 
          * Map of listeners that will be reported about the end of operations from a {@link OperationsServiceBinder} instance 
          */
         /** 
          * Map of listeners that will be reported about the end of operations from a {@link OperationsServiceBinder} instance 
          */

-        private Set<OnRemoteOperationListener> mBoundListeners = new HashSet<OnRemoteOperationListener>();
+        private Map<OnRemoteOperationListener, Handler> mBoundListeners = new HashMap<OnRemoteOperationListener, Handler>();

         
         /**
          * Cancels an operation
         
         /**
          * Cancels an operation


@@ -200,6 +198,7 @@ public class OperationsService extends Service {
         
         
         public void clearListeners() {
         
         
         public void clearListeners() {

+            

             mBoundListeners.clear();
         }
 
             mBoundListeners.clear();
         }
 


@@ -207,10 +206,11 @@ public class OperationsService extends Service {
         /**
          * Adds a listener interested in being reported about the end of operations.
          * 
         /**
          * Adds a listener interested in being reported about the end of operations.
          * 

-         * @param listener      Object to notify about the end of operations.    
+         * @param listener          Object to notify about the end of operations.    
+         * @param callbackHandler   {@link Handler} to access the listener without breaking Android threading protection.

          */
          */

-        public void addOperationListener (OnRemoteOperationListener listener) {
-            mBoundListeners.add(listener);
+        public void addOperationListener (OnRemoteOperationListener listener, Handler callbackHandler) {
+            mBoundListeners.put(listener, callbackHandler);

         }
         
         
         }
         
         


@@ -230,7 +230,7 @@ public class OperationsService extends Service {
          * @return  'True' when an operation that enforces the user to wait for completion is in process.
          */
         public boolean isPerformingBlockingOperation() {
          * @return  'True' when an operation that enforces the user to wait for completion is in process.
          */
         public boolean isPerformingBlockingOperation() {

-            return (mPendingOperations.size() > 0);
+            return (!mPendingOperations.isEmpty());

         }
 
     }
         }
 
     }


@@ -323,7 +323,7 @@ public class OperationsService extends Service {
                 }
             }
             
                 }
             }
             

-            sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);
+            //sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);

             callbackOperationListeners(mLastTarget, mCurrentOperation, result);
         }
     }
             callbackOperationListeners(mLastTarget, mCurrentOperation, result);
         }
     }


@@ -382,11 +382,21 @@ 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 callbackOperationListeners(Target target, RemoteOperation operation, RemoteOperationResult result) {
-        Iterator<OnRemoteOperationListener> it = mBinder.mBoundListeners.iterator();
-        while (it.hasNext()) {
-            it.next().onRemoteOperationFinish(operation, result);
+    private void callbackOperationListeners(Target target, final RemoteOperation operation, final RemoteOperationResult result) {
+        Iterator<OnRemoteOperationListener> listeners = mBinder.mBoundListeners.keySet().iterator();
+        while (listeners.hasNext()) {
+            final OnRemoteOperationListener listener = listeners.next();
+            final Handler handler = mBinder.mBoundListeners.get(listener);
+            if (handler != null) { 
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        listener.onRemoteOperationFinish(operation, result);
+                    }
+                });
+            }

         }
         }

+            

     }
     
 
     }