From: masensio <masensio@solidgear.es>
Date: Wed, 18 Feb 2015 17:39:10 +0000 (+0100)
Subject: Cancel downloads for deleted users
X-Git-Tag: oc-android-1.7.1_signed^2~40^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/20583912301fc6b0ec069ebfeeba50d52d435183?ds=inline

Cancel downloads for deleted users
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fd92d3d6..b520d092 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,8 +86,6 @@
             android:name=".ui.activity.Preferences"
             android:theme="@style/Theme.ownCloud" >
         </activity>
-        <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
-        </activity>
         
         <activity	
             android:name=".ui.preview.PreviewImageActivity" 
diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index feedc11c..4ae3325d 100644
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -25,8 +25,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Vector;
+import java.util.concurrent.ConcurrentMap;
 
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -249,7 +251,42 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
                 }
             }
         }
-        
+
+        /**
+         * Cancels a pending or current upload for an account
+         *
+         * @param account Owncloud accountName where the remote file will be stored.
+         */
+        public void cancel(Account account) {
+            Log_OC.d(TAG, "Account= " + account.name);
+
+            if (mCurrentDownload != null) {
+                Log_OC.d(TAG, "Current Download Account= " + mCurrentDownload.getAccount().name);
+                if (mCurrentDownload.getAccount().name.equals(account.name)) {
+                    mCurrentDownload.cancel();
+                }
+            }
+            // Cancel pending downloads
+            ConcurrentMap downloadsAccount = mPendingDownloads.get(account);
+            Iterator<String> it = downloadsAccount.keySet().iterator();
+            Log_OC.d(TAG, "Number of pending downloads= " + downloadsAccount.size());
+            while (it.hasNext()) {
+                String key = it.next();
+                Log_OC.d(TAG, "download CANCELLED " + key);
+                if (key.startsWith(account.name)) {
+                    DownloadFileOperation download;
+                    synchronized (mPendingDownloads) {
+                        download = mPendingDownloads.get(key);
+                        if (download != null) {
+                            String remotePath = download.getRemotePath();
+                            if (mPendingDownloads.contains(account, remotePath)) {
+                                mPendingDownloads.remove(account, remotePath);
+                            }
+                        }
+                    }
+                }
+            }
+        }
         
         public void clearListeners() {
             mBoundListeners.clear();
@@ -350,11 +387,11 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             mService.stopSelf(msg.arg1);
         }
     }
-    
+
 
     /**
      * Core download method: requests a file to download and stores it.
-     * 
+     *
      * @param downloadKey   Key to access the download to perform, contained in mPendingDownloads 
      */
     private void downloadFile(String downloadKey) {
@@ -364,54 +401,61 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         mCurrentDownload = mPendingDownloads.get(downloadKey);
 
         if (mCurrentDownload != null) {
-            
-            notifyDownloadStart(mCurrentDownload);
-
-            RemoteOperationResult downloadResult = null;
-            try {
-                /// prepare client object to send the request to the ownCloud server
-                if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) {
-                    mCurrentAccount = mCurrentDownload.getAccount();
-                    mStorageManager = new FileDataStorageManager(
-                            mCurrentAccount,
-                            getContentResolver()
-                    );
-                }   // else, reuse storage manager from previous operation
-
-                // always get client from client manager, to get fresh credentials in case of update
-                OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this);
-                mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                        getClientFor(ocAccount, this);
+            // Detect if the account exists
+            if (AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) {
+                Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " exists");
+                notifyDownloadStart(mCurrentDownload);
 
-
-                /// perform the download
-                /*Log_OC.v(   "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+                RemoteOperationResult downloadResult = null;
+                try {
+                    /// prepare client object to send the request to the ownCloud server
+                    if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) {
+                        mCurrentAccount = mCurrentDownload.getAccount();
+                        mStorageManager = new FileDataStorageManager(
+                                mCurrentAccount,
+                                getContentResolver()
+                        );
+                    }   // else, reuse storage manager from previous operation
+
+                    // always get client from client manager, to get fresh credentials in case of update
+                    OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this);
+                    mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                            getClientFor(ocAccount, this);
+
+
+                    /// perform the download
+                    /*Log_OC.v(   "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
                         "Executing download of " + mCurrentDownload.getRemotePath());*/
-                downloadResult = mCurrentDownload.execute(mDownloadClient);
-                if (downloadResult.isSuccess()) {
-                    saveDownloadedFile();
-                }
-            
-            } catch (AccountsException e) {
-                Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e);
-                downloadResult = new RemoteOperationResult(e);
-            } catch (IOException e) {
-                Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e);
-                downloadResult = new RemoteOperationResult(e);
-                
-            } finally {
+                    downloadResult = mCurrentDownload.execute(mDownloadClient);
+                    if (downloadResult.isSuccess()) {
+                        saveDownloadedFile();
+                    }
+
+                } catch (AccountsException e) {
+                    Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e);
+                    downloadResult = new RemoteOperationResult(e);
+                } catch (IOException e) {
+                    Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e);
+                    downloadResult = new RemoteOperationResult(e);
+
+                } finally {
                 /*Log_OC.v(   "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
                         "Removing payload " + mCurrentDownload.getRemotePath());*/
 
-                Pair<DownloadFileOperation, String> removeResult =
-                        mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath());
+                    Pair<DownloadFileOperation, String> removeResult =
+                            mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath());
 
-                /// notify result
-                notifyDownloadResult(mCurrentDownload, downloadResult);
+                    /// notify result
+                    notifyDownloadResult(mCurrentDownload, downloadResult);
 
-                sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second);
-            }
+                    sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second);
+                }
+            } else {
+                // Cancel the transfer
+                Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " doesn't exist");
+                cancelDownloadsForAccount(mCurrentDownload.getAccount());
 
+            }
         }
     }
 
@@ -609,4 +653,32 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         sendStickyBroadcast(added);
     }
 
+    /**
+     * Remove downloads of an account
+     * @param account
+     */
+    private void cancelDownloadsForAccount(Account account){
+        // Cancel pending downloads
+        ConcurrentMap downloadsAccount = mPendingDownloads.get(account);
+        Iterator<String> it = downloadsAccount.keySet().iterator();
+        Log_OC.d(TAG, "Number of pending downloads= " + downloadsAccount.size());
+        while (it.hasNext()) {
+            String key = it.next();
+            Log_OC.d(TAG, "download CANCELLED " + key);
+            if (key.startsWith(account.name)) {
+                DownloadFileOperation download;
+                synchronized (mPendingDownloads) {
+                    download = mPendingDownloads.get(key);
+                    if (download != null) {
+                        String remotePath = download.getRemotePath();
+                        if (mPendingDownloads.contains(account, remotePath)) {
+                            mPendingDownloads.remove(account, remotePath);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
 }
diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index c5b92171..b076d6f4 100644
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -367,23 +367,19 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
 
             if (mCurrentUpload != null) {
                 Log_OC.d(TAG, "Current Upload Account= " + mCurrentUpload.getAccount().name);
-                if (mCurrentUpload.getAccount().name == account.name) {
+                if (mCurrentUpload.getAccount().name.equals(account.name)) {
                     mCurrentUpload.cancel();
                 }
             }
             // Cancel pending uploads
             Iterator<String> it = mPendingUploads.keySet().iterator();
-            Log_OC.d(TAG, "Number of pending updloads= "  + mPendingUploads.size());
+            Log_OC.d(TAG, "Number of pending uploads= "  + mPendingUploads.size());
             while (it.hasNext()) {
                 String key = it.next();
                 Log_OC.d(TAG, "mPendingUploads CANCELLED " + key);
                 if (key.startsWith(account.name)) {
-                    UploadFileOperation upload;
                     synchronized (mPendingUploads) {
-                        upload = mPendingUploads.remove(key);
-                    }
-                    if (upload != null) {
-                        mCurrentUpload.cancel();
+                        mPendingUploads.remove(key);
                     }
                 }
             }
diff --git a/src/com/owncloud/android/files/services/IndexedForest.java b/src/com/owncloud/android/files/services/IndexedForest.java
index e2e9cb85..f3c38fdd 100644
--- a/src/com/owncloud/android/files/services/IndexedForest.java
+++ b/src/com/owncloud/android/files/services/IndexedForest.java
@@ -21,8 +21,11 @@ import android.accounts.Account;
 import android.util.Pair;
 
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.operations.UploadFileOperation;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -210,6 +213,21 @@ public class IndexedForest<V> {
     }
 
 
+    public ConcurrentMap<String, Node<V>> get(Account account){
+        ConcurrentMap<String, Node<V>> accountMap = new ConcurrentHashMap<String, Node<V>>();
+        Iterator<String> it = mMap.keySet().iterator();
+        while (it.hasNext()) {
+            String key = it.next();
+            Log_OC.d("IndexedForest", "Number of pending downloads= "  + mMap.size());
+            if (key.startsWith(account.name)) {
+                synchronized (accountMap) {
+                    accountMap.putIfAbsent(key, mMap.get(key));
+                }
+            }
+        }
+        return accountMap;
+    }
+
     /**
      * Builds a key to index files
      *
diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java
index 0a5ff94c..f6bee5d4 100644
--- a/src/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/src/com/owncloud/android/operations/DownloadFileOperation.java
@@ -177,5 +177,4 @@ public class DownloadFileOperation extends RemoteOperation {
             mDataTransferListeners.remove(listener);
         }
     }
-    
 }
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 086e10a9..3b796966 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1892,10 +1892,6 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
         onTransferStateChanged(file, false, false);
     }
 
-    public void cancelUploadsForAnAccount(Account account) {
-        mUploaderBinder.cancel(account);
-    }
-
     @Override
     public void onRefresh(boolean ignoreETag) {
         refreshList(ignoreETag);
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index b03cd961..3b98061e 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -65,6 +65,8 @@ import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.RadioButtonPreference;
 import com.owncloud.android.utils.DisplayUtils;
 
+import java.io.File;
+
 
 /**
  * An Activity that allows the user to change the application's settings.
@@ -443,6 +445,7 @@ public class Preferences extends SherlockPreferenceActivity
             if (!AccountUtils.exists(account, MainApp.getAppContext())) {
                 // Cancel tranfers
                 mUploaderBinder.cancel(account);
+                mDownloaderBinder.cancel(account);
             }
 
             Account a = AccountUtils.getCurrentOwnCloudAccount(this);