/* ownCloud Android client application
* Copyright (C) 2012 Bartek Przybylski
- * Copyright (C) 2012-2013 ownCloud Inc.
+ * Copyright (C) 2012-2015 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
import java.io.File;
import java.io.IOException;
import java.util.AbstractList;
-import java.util.ArrayList;
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;
public static final String EXTRA_ACCOUNT = "ACCOUNT";
public static final String EXTRA_FILE = "FILE";
- public static final String ACTION_CANCEL_FILE_DOWNLOAD = "CANCEL_FILE_DOWNLOAD";
-
private static final String DOWNLOAD_ADDED_MESSAGE = "DOWNLOAD_ADDED";
private static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";
public static final String EXTRA_DOWNLOAD_RESULT = "RESULT";
private ServiceHandler mServiceHandler;
private IBinder mBinder;
private OwnCloudClient mDownloadClient = null;
- private Account mLastAccount = null;
+ private Account mCurrentAccount = null;
private FileDataStorageManager mStorageManager;
private IndexedForest<DownloadFileOperation> mPendingDownloads = new IndexedForest<DownloadFileOperation>();
final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);
final OCFile file = intent.getParcelableExtra(EXTRA_FILE);
- /*
- if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) {
-
- new Thread(new Runnable() {
- public void run() {
- // Cancel the download
- cancel(account, file);
- }
- }).start();
-
- } else {
- */
+ /*Log_OC.v(
+ "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Received request to download file"
+ );*/
AbstractList<String> requestedDownloads = new Vector<String>();
try {
DownloadFileOperation newDownload = new DownloadFileOperation(account, file);
+ newDownload.addDatatransferProgressListener(this);
+ newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder);
Pair<String, String> putResult = mPendingDownloads.putIfAbsent(
account, file.getRemotePath(), newDownload
);
String downloadKey = putResult.first;
- newDownload.addDatatransferProgressListener(this);
- newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder);
requestedDownloads.add(downloadKey);
+ /*Log_OC.v(
+ "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Download on " + file.getRemotePath() + " added to queue"
+ );*/
// Store file on db with state 'downloading'
/*
* @param file A file in the queue of pending downloads
*/
public void cancel(Account account, OCFile file) {
+ /*Log_OC.v(
+ "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Received request to cancel download of " + file.getRemotePath()
+ );
+ Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Removing download of " + file.getRemotePath());*/
Pair<DownloadFileOperation, String> removeResult = mPendingDownloads.remove(account, file.getRemotePath());
DownloadFileOperation download = removeResult.first;
if (download != null) {
+ /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Canceling returned download of " + file.getRemotePath());*/
download.cancel();
} else {
- // TODO synchronize
- if (mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) &&
- account.name.equals(mLastAccount.name)) {
+ if (mCurrentDownload != null && mCurrentAccount != null &&
+ mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) &&
+ account.name.equals(mCurrentAccount.name)) {
+ /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath());*/
mCurrentDownload.cancel();
}
}
}
-
+
+ /**
+ * 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();
if (msg.obj != null) {
Iterator<String> it = requestedDownloads.iterator();
while (it.hasNext()) {
- mService.downloadFile(it.next());
+ String next = it.next();
+ /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Handling download file " + next);*/
+ mService.downloadFile(next);
}
}
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) {
+ /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Getting download of " + downloadKey);*/
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 (mDownloadClient == null || !mLastAccount.equals(mCurrentDownload.getAccount())) {
- mLastAccount = mCurrentDownload.getAccount();
- mStorageManager =
- new FileDataStorageManager(mLastAccount, getContentResolver());
- OwnCloudAccount ocAccount = new OwnCloudAccount(mLastAccount, this);
+ // Detect if the account exists
+ if (AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) {
+ Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " exists");
+ 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);
- }
- /// perform the download
- downloadResult = mCurrentDownload.execute(mDownloadClient);
- if (downloadResult.isSuccess()) {
- saveDownloadedFile();
- /*} else {
- updateUnsuccessfulDownloadedFile();
- */
- }
-
- } catch (AccountsException e) {
- Log_OC.e(TAG, "Error while trying to get authorization for " + mLastAccount.name, e);
- downloadResult = new RemoteOperationResult(e);
- } catch (IOException e) {
- Log_OC.e(TAG, "Error while trying to get authorization for " + mLastAccount.name, e);
- downloadResult = new RemoteOperationResult(e);
-
- } finally {
- Pair<DownloadFileOperation, String> removeResult =
- mPendingDownloads.remove(mLastAccount, mCurrentDownload.getRemotePath());
- /// notify result
- notifyDownloadResult(mCurrentDownload, downloadResult);
+ /// 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();
+ }
- sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second);
- }
+ } 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());
+
+ /// notify result
+ notifyDownloadResult(mCurrentDownload, downloadResult);
+
+ sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second);
+ }
+ } else {
+ // Cancel the transfer
+ Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " doesn't exist");
+ cancelDownloadsForAccount(mCurrentDownload.getAccount());
+
+ }
}
}
file.setStoragePath(mCurrentDownload.getSavePath());
file.setFileLength((new File(mCurrentDownload.getSavePath()).length()));
file.setRemoteId(mCurrentDownload.getFile().getRemoteId());
- //file.setDownloading(false);
mStorageManager.saveFile(file);
mStorageManager.triggerMediaScan(file.getStoragePath());
}
.setContentIntent(PendingIntent.getActivity(
this, (int) System.currentTimeMillis(), updateAccountCredentials, PendingIntent.FLAG_ONE_SHOT));
- mDownloadClient = null; // grant that future retries on the same account will get the fresh credentials
-
} else {
// TODO put something smart in showDetailsIntent
Intent showDetailsIntent = new Intent();
}
/**
- * Cancel operation
- * @param account ownCloud account where the remote file is stored.
- * @param file File OCFile
- *-/
- public void cancel(Account account, OCFile file){
- DownloadFileOperation download = null;
- //String targetKey = buildKey(account, file.getRemotePath());
- ArrayList<String> keyItems = new ArrayList<String>();
- if (file.isFolder()) {
- Log_OC.d(TAG, "Folder download. Canceling pending downloads (from folder)");
-
- // TODO
- /*
- Iterator<String> it = mPendingDownloads.keySet().iterator();
- boolean found = false;
- while (it.hasNext()) {
- String keyDownloadOperation = it.next();
- found = keyDownloadOperation.startsWith(targetKey);
- if (found) {
- keyItems.add(keyDownloadOperation);
- }
- }
-
- for (String item: keyItems) {
- download = mPendingDownloads.remove(item);
- Log_OC.d(TAG, "Key removed: " + item);
-
- if (download != null) {
- download.cancel();
+ * 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);
+ }
+ }
}
}
-
- *-/
-
- } else {
- // this is not really expected...
- Log_OC.d(TAG, "Canceling file download");
- download = mPendingDownloads.remove(account, file.getRemotePath());
- if (download != null) {
- download.cancel();
- }
}
}
- */
+
}
projects / pub / Android / ownCloud.git / blobdiff