X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/eb95be232f4e07a044fa692c1254fecaa60f52ee..af45cabf35fd1f8fa48038930a0a59d0ad121037:/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 81a4adee..a4de86a9 100644
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -52,6 +52,7 @@ import android.os.IBinder;
 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 {
@@ -148,22 +149,31 @@ public class OperationsService extends Service {
      */
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        //Log.wtf(TAG, "onStartCommand init" );
+        Log.wtf(TAG, "onStartCommand init" );
         Message msg = mServiceHandler.obtainMessage();
         msg.arg1 = startId;
         mServiceHandler.sendMessage(msg);
-        //Log.wtf(TAG, "onStartCommand end" );
+        Log.wtf(TAG, "onStartCommand end" );
         return START_NOT_STICKY;
     }
 
-    
+    @Override
+    public void onDestroy() {
+        Log.wtf(TAG, "onDestroy init" );
+        super.onDestroy();
+        Log.wtf(TAG, "Clear mOperationResults" );
+        mOperationResults.clear();
+        Log.wtf(TAG, "onDestroy end" );
+    }
+
+
     /**
      * Provides a binder object that clients can use to perform actions on the queue of operations, 
      * except the addition of new operations. 
      */
     @Override
     public IBinder onBind(Intent intent) {
-        //Log.wtf(TAG, "onBind" );
+        Log.wtf(TAG, "onBind" );
         return mBinder;
     }
 
@@ -338,9 +348,9 @@ public class OperationsService extends Service {
             }
         }
 
-        public RemoteOperationResult getOperationResultIfFinished(int mDetectAuthOpId) {
-            //Log_OC.wtf(TAG, "Searching result for operation with id " + mDetectAuthOpId);
-            return mOperationResults.remove(mDetectAuthOpId);
+        public RemoteOperationResult getOperationResultIfFinished(int operationId) {
+            Log_OC.wtf(TAG, "Searching result for operation with id " + operationId);
+            return mOperationResults.remove(operationId);
         }
 
     }
@@ -375,7 +385,7 @@ public class OperationsService extends Service {
      */
     private void nextOperation() {
         
-        //Log.wtf(TAG, "nextOperation init" );
+        Log.wtf(TAG, "nextOperation init" );
         
         Pair<Target, RemoteOperation> next = null;
         synchronized(mPendingOperations) {
@@ -443,12 +453,11 @@ public class OperationsService extends Service {
             } finally {
                 synchronized(mPendingOperations) {
                     mPendingOperations.poll();
-                    mOperationResults.put(mCurrentOperation.hashCode(), result);
                 }
             }
             
             //sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);
-            callbackOperationListeners(mLastTarget, mCurrentOperation, result);
+            dispatchOperationListeners(mLastTarget, mCurrentOperation, result);
         }
     }
 
@@ -506,7 +515,7 @@ public class OperationsService extends Service {
      * @param operation         Finished operation.
      * @param result            Result of the operation.
      */
-    private void callbackOperationListeners(
+    private void dispatchOperationListeners(
             Target target, final RemoteOperation operation, final RemoteOperationResult result) {
         int count = 0;
         Iterator<OnRemoteOperationListener> listeners = mBinder.mBoundListeners.keySet().iterator();
@@ -523,6 +532,9 @@ public class OperationsService extends Service {
                 count += 1;
             }
         }
+        if (count == 0) {
+            mOperationResults.put(operation.hashCode(), result);
+        }
         Log_OC.d(TAG, "Called " + count + " listeners");
     }