Improved release of resources in FileObserverService#onDestroy

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / FileObserverService.java

diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index c1b4659..cb72cc4 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -20,6 +20,7 @@ package com.owncloud.android.files.services;
 
 import java.io.File;
 import java.util.HashMap;
 
 import java.io.File;
 import java.util.HashMap;

+import java.util.Iterator;

 import java.util.Map;
 
 import com.owncloud.android.MainApp;
 import java.util.Map;
 
 import com.owncloud.android.MainApp;


@@ -133,8 +134,14 @@ public class FileObserverService extends Service {
         Log_OC.d(TAG, "onDestroy - FINISHING OBSERVATION");
         
         unregisterReceiver(mDownloadReceiver);
         Log_OC.d(TAG, "onDestroy - FINISHING OBSERVATION");
         
         unregisterReceiver(mDownloadReceiver);

+        
+        Iterator<OwnCloudFileObserver> it = mObserversMap.values().iterator();
+        while (it.hasNext()) {
+            it.next().stopWatching();
+        }

         mObserversMap.clear();
         mObserversMap.clear();

-        mObserversMap = null;   
+        mObserversMap = null;
+        

         //mObserverParentsMap = null;
         
         super.onDestroy();
         //mObserverParentsMap = null;
         
         super.onDestroy();