import java.util.concurrent.ConcurrentHashMap;\r
import java.util.concurrent.ConcurrentMap;\r
\r
+import com.owncloud.android.datamodel.OCFile;\r
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
import eu.alefzero.webdav.OnDatatransferProgressListener;\r
\r
import com.owncloud.android.network.OwnCloudClientUtils;\r
import com.owncloud.android.operations.DownloadFileOperation;\r
import com.owncloud.android.operations.RemoteOperationResult;\r
+import com.owncloud.android.ui.activity.FileDetailActivity;\r
+import com.owncloud.android.ui.fragment.FileDetailFragment;\r
\r
import android.accounts.Account;\r
import android.app.Notification;\r
import android.os.Process;\r
import android.util.Log;\r
import android.widget.RemoteViews;\r
+\r
import com.owncloud.android.R;\r
import eu.alefzero.webdav.WebdavClient;\r
\r
public class FileDownloader extends Service implements OnDatatransferProgressListener {\r
+ public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
+ public static final String EXTRA_FILE = "FILE";\r
+ \r
public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";\r
public static final String EXTRA_DOWNLOAD_RESULT = "RESULT"; \r
- public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
public static final String EXTRA_FILE_PATH = "FILE_PATH";\r
public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";\r
- public static final String EXTRA_FILE_SIZE = "FILE_SIZE";\r
public static final String ACCOUNT_NAME = "ACCOUNT_NAME";\r
\r
private static final String TAG = "FileDownloader";\r
/**\r
* Builds a key for mDownloadsInProgress from the accountName and remotePath\r
*/\r
- private static String buildRemoteName(String accountName, String remotePath) {\r
- return accountName + remotePath;\r
+ private String buildRemoteName(Account account, OCFile file) {\r
+ return account.name + file.getRemotePath();\r
}\r
\r
public static final String getSavePath(String accountName) {\r
@Override\r
public int onStartCommand(Intent intent, int flags, int startId) {\r
if ( !intent.hasExtra(EXTRA_ACCOUNT) ||\r
- !intent.hasExtra(EXTRA_FILE_PATH) ||\r
- !intent.hasExtra(EXTRA_REMOTE_PATH)\r
+ !intent.hasExtra(EXTRA_FILE)\r
+ /*!intent.hasExtra(EXTRA_FILE_PATH) ||\r
+ !intent.hasExtra(EXTRA_REMOTE_PATH)*/\r
) {\r
Log.e(TAG, "Not enough information provided in intent");\r
return START_NOT_STICKY;\r
}\r
Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);\r
- String filePath = intent.getStringExtra(EXTRA_FILE_PATH);\r
- String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);\r
- long totalDownloadSize = intent.getLongExtra(EXTRA_FILE_SIZE, -1);\r
-\r
- AbstractList<String> requestedDownloads = new Vector<String>(); // dvelasco: now this will always contain just one element, but that can change in a near future\r
- String downloadKey = buildRemoteName(account.name, remotePath);\r
+ OCFile file = intent.getParcelableExtra(EXTRA_FILE);\r
+ \r
+ AbstractList<String> requestedDownloads = new Vector<String>(); // dvelasco: now this always contains just one element, but that can change in a near future (download of multiple selection)\r
+ String downloadKey = buildRemoteName(account, file);\r
try {\r
- DownloadFileOperation newDownload = new DownloadFileOperation(account, filePath, remotePath, (String)null, totalDownloadSize, false); \r
+ DownloadFileOperation newDownload = new DownloadFileOperation(account, file); \r
mPendingDownloads.putIfAbsent(downloadKey, newDownload);\r
newDownload.addDatatransferProgressListener(this);\r
requestedDownloads.add(downloadKey);\r
* Cancels a pending or current download of a remote file.\r
* \r
* @param account Owncloud account where the remote file is stored.\r
- * @param remotePath URL to the remote file in the queue of downloads.\r
+ * @param file A file in the queue of pending downloads\r
*/\r
- public void cancel(Account account, String remotePath) {\r
+ public void cancel(Account account, OCFile file) {\r
DownloadFileOperation download = null;\r
synchronized (mPendingDownloads) {\r
- download = mPendingDownloads.remove(buildRemoteName(account.name, remotePath));\r
+ download = mPendingDownloads.remove(buildRemoteName(account, file));\r
}\r
if (download != null) {\r
download.cancel();\r
* Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading\r
* \r
* @param account Owncloud account where the remote file is stored.\r
- * @param remotePath URL to the remote file in the queue of downloads.\r
+ * @param file A file in the queue of downloads.\r
*/\r
- public boolean isDownloading(Account account, String remotePath) {\r
+ public boolean isDownloading(Account account, OCFile file) {\r
synchronized (mPendingDownloads) {\r
- return (mPendingDownloads.containsKey(buildRemoteName(account.name, remotePath)));\r
+ return (mPendingDownloads.containsKey(buildRemoteName(account, file)));\r
}\r
}\r
}\r
\r
+ \r
/** \r
* Download worker. Performs the pending downloads in the order they were requested. \r
* \r
}\r
\r
/// perform the download\r
- //mDownloadsInProgress.add(buildRemoteName(mLastAccount.name, mCurrentDownload.getRemotePath()));\r
RemoteOperationResult downloadResult = null;\r
- File newLocalFile = null;\r
- //try {\r
+ try {\r
downloadResult = mCurrentDownload.execute(mDownloadClient);\r
if (downloadResult.isSuccess()) {\r
ContentValues cv = new ContentValues();\r
- newLocalFile = new File(getSavePath(mCurrentDownload.getAccount().name) + mCurrentDownload.getLocalPath());\r
- cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newLocalFile.getAbsolutePath());\r
+ cv.put(ProviderTableMeta.FILE_STORAGE_PATH, mCurrentDownload.getSavePath());\r
getContentResolver().update(\r
ProviderTableMeta.CONTENT_URI,\r
cv,\r
ProviderTableMeta.FILE_NAME + "=? AND "\r
+ ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
new String[] {\r
- mCurrentDownload.getLocalPath().substring(mCurrentDownload.getLocalPath().lastIndexOf('/') + 1),\r
+ mCurrentDownload.getSavePath().substring(mCurrentDownload.getSavePath().lastIndexOf('/') + 1),\r
mLastAccount.name });\r
}\r
\r
- /*} finally {\r
- mDownloadsInProgress.remove(buildRemoteName(mLastAccount.name, mCurrentDownload.getRemotePath()));\r
- }*/\r
- \r
- mPendingDownloads.remove(downloadKey);\r
+ } finally {\r
+ mPendingDownloads.remove(downloadKey);\r
+ }\r
+\r
\r
/// notify result\r
notifyDownloadResult(mCurrentDownload, downloadResult);\r
\r
- sendFinalBroadcast(mCurrentDownload, downloadResult, (downloadResult.isSuccess())? newLocalFile.getAbsolutePath():null);\r
+ sendFinalBroadcast(mCurrentDownload, downloadResult);\r
}\r
}\r
\r
mNotification.flags |= Notification.FLAG_ONGOING_EVENT;\r
mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);\r
mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, download.getSize() == -1);\r
- mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getLocalPath()).getName()));\r
+ mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getSavePath()).getName()));\r
mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);\r
- // TODO put something smart in the contentIntent below\r
- mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);\r
+ \r
+ /// includes a pending intent in the notification showing the details view of the file\r
+ Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+ showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, download.getFile());\r
+ showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, download.getAccount());\r
+ showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
+ mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, showDetailsIntent, PendingIntent.FLAG_UPDATE_CURRENT);\r
+ \r
mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification);\r
}\r
\r
finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;\r
// TODO put something smart in the contentIntent below\r
finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);\r
- finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getLocalPath()).getName()), finalNotification.contentIntent);\r
+ finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getSavePath()).getName()), finalNotification.contentIntent);\r
mNotificationMngr.notify(tickerId, finalNotification);\r
}\r
}\r
* \r
* @param download Finished download operation\r
* @param downloadResult Result of the download operation\r
- * @param newFilePath Absolute path to the downloaded file\r
*/\r
- private void sendFinalBroadcast(DownloadFileOperation download, RemoteOperationResult downloadResult, String newFilePath) {\r
+ private void sendFinalBroadcast(DownloadFileOperation download, RemoteOperationResult downloadResult) {\r
Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess());\r
end.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());\r
if (downloadResult.isSuccess()) {\r
- end.putExtra(EXTRA_FILE_PATH, newFilePath);\r
+ end.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r
}\r
sendBroadcast(end);\r
}\r
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.http.HttpStatus;
+import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader;
import com.owncloud.android.operations.RemoteOperation;
import com.owncloud.android.operations.RemoteOperationResult;
private static final String TAG = DownloadFileOperation.class.getCanonicalName();
private Account mAccount = null;
- private String mLocalPath = null;
- private String mRemotePath = null;
- private String mMimeType = null;
- private long mSize = -1;
+ private OCFile mFile;
private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
- public Account getAccount() {
- return mAccount;
+ public DownloadFileOperation(Account account, OCFile file) {
+ if (account == null)
+ throw new IllegalArgumentException("Illegal null account in DownloadFileOperation creation");
+ if (file == null)
+ throw new IllegalArgumentException("Illegal null file in DownloadFileOperation creation");
+
+ mAccount = account;
+ mFile = file;
}
- public String getLocalPath() {
- return mLocalPath;
+
+ public Account getAccount() {
+ return mAccount;
}
- public String getRemotePath() {
- return mRemotePath;
+ public OCFile getFile() {
+ return mFile;
}
- public String getMimeType() {
- return mMimeType;
+ public String getSavePath() {
+ return FileDownloader.getSavePath(mAccount.name) + mFile.getRemotePath();
}
- public long getSize() {
- return mSize;
+ public String getTmpPath() {
+ return FileDownloader.getTemporalPath(mAccount.name) + mFile.getRemotePath();
}
-
- public DownloadFileOperation( Account account,
- String localPath,
- String remotePath,
- String mimeType,
- long size,
- boolean forceOverwrite) {
-
- if (account == null)
- throw new IllegalArgumentException("Illegal null account in DownloadFileOperation creation");
- if (localPath == null)
- throw new IllegalArgumentException("Illegal null local path in DownloadFileOperation creation");
- if (remotePath == null)
- throw new IllegalArgumentException("Illegal null remote path in DownloadFileOperation creation");
-
- mAccount = account;
- mLocalPath = localPath;
- mRemotePath = remotePath;
- mMimeType = mimeType;
- if (mMimeType == null) {
+ public String getRemotePath() {
+ return mFile.getRemotePath();
+ }
+
+ public String getMimeType() {
+ String mimeType = mFile.getMimetype();
+ if (mimeType == null || mimeType.length() <= 0) {
try {
- mMimeType = MimeTypeMap.getSingleton()
+ mimeType = MimeTypeMap.getSingleton()
.getMimeTypeFromExtension(
- localPath.substring(localPath.lastIndexOf('.') + 1));
+ mFile.getRemotePath().substring(mFile.getRemotePath().lastIndexOf('.') + 1));
} catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Trying to find out MIME type of a file without extension: " + localPath);
+ Log.e(TAG, "Trying to find out MIME type of a file without extension: " + mFile.getRemotePath());
}
}
- if (mMimeType == null) {
- mMimeType = "application/octet-stream";
+ if (mimeType == null) {
+ mimeType = "application/octet-stream";
}
- mSize = size;
+ return mimeType;
}
- public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
- mDataTransferListeners.add(listener);
+ public long getSize() {
+ return mFile.getFileLength();
}
+ public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
+ mDataTransferListeners.add(listener);
+ }
@Override
protected RemoteOperationResult run(WebdavClient client) {
File newFile = null;
boolean moved = false;
- /// download will be in a temporal file
- File tmpFile = new File(FileDownloader.getTemporalPath(mAccount.name) + mLocalPath);
+ /// download will be performed to a temporal file, then moved to the final location
+ File tmpFile = new File(getTmpPath());
/// perform the download
try {
tmpFile.getParentFile().mkdirs();
int status = downloadFile(client, tmpFile);
if (isSuccess(status)) {
- newFile = new File(FileDownloader.getSavePath(mAccount.name) + mLocalPath);
+ newFile = new File(getSavePath());
newFile.getParentFile().mkdirs();
moved = tmpFile.renameTo(newFile);
}
result = new RemoteOperationResult(RemoteOperationResult.ResultCode.STORAGE_ERROR_MOVING_FROM_TMP);
else
result = new RemoteOperationResult(isSuccess(status), status);
- Log.i(TAG, "Download of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
+ Log.i(TAG, "Download of " + mFile.getRemotePath() + " to " + getSavePath() + ": " + result.getLogMessage());
} catch (Exception e) {
result = new RemoteOperationResult(e);
- Log.e(TAG, "Download of " + mRemotePath + " to " + mLocalPath + ": " + result.getLogMessage(), e);
+ Log.e(TAG, "Download of " + mFile.getRemotePath() + " to " + getSavePath() + ": " + result.getLogMessage(), e);
}
return result;
protected int downloadFile(WebdavClient client, File targetFile) throws HttpException, IOException, OperationCancelledException {
int status = -1;
boolean savedFile = false;
- GetMethod get = new GetMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));
+ GetMethod get = new GetMethod(client.getBaseUri() + WebdavUtils.encodePath(mFile.getRemotePath()));
Iterator<OnDatatransferProgressListener> it = null;
FileOutputStream fos = null;
transferred += readResult;
it = mDataTransferListeners.iterator();
while (it.hasNext()) {
- it.next().onTransferProgress(readResult, transferred, mSize, targetFile.getName());
+ it.next().onTransferProgress(readResult, transferred, mFile.getFileLength(), targetFile.getName());
}
}
savedFile = true;
public void cancel() {
mCancellationRequested.set(true); // atomic set; there is no need of synchronizing it
}
-
+
}
projects / pub / Android / ownCloud.git / commitdiff