From: David A. Velasco Date: Wed, 10 Oct 2012 11:13:22 +0000 (+0200) Subject: Show the details of a file when the status notification of a download in progress... X-Git-Tag: oc-android-1.4.3~159 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/25f307c98adbad05ed1448684651d8780b8ae59b?ds=inline Show the details of a file when the status notification of a download in progress is clicked --- diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 4969c908..b346ed77 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -7,12 +7,15 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import eu.alefzero.webdav.OnDatatransferProgressListener; import com.owncloud.android.network.OwnCloudClientUtils; import com.owncloud.android.operations.DownloadFileOperation; import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.ui.activity.FileDetailActivity; +import com.owncloud.android.ui.fragment.FileDetailFragment; import android.accounts.Account; import android.app.Notification; @@ -32,16 +35,18 @@ import android.os.Message; import android.os.Process; import android.util.Log; import android.widget.RemoteViews; + import com.owncloud.android.R; import eu.alefzero.webdav.WebdavClient; public class FileDownloader extends Service implements OnDatatransferProgressListener { + public static final String EXTRA_ACCOUNT = "ACCOUNT"; + public static final String EXTRA_FILE = "FILE"; + public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH"; public static final String EXTRA_DOWNLOAD_RESULT = "RESULT"; - public static final String EXTRA_ACCOUNT = "ACCOUNT"; public static final String EXTRA_FILE_PATH = "FILE_PATH"; public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH"; - public static final String EXTRA_FILE_SIZE = "FILE_SIZE"; public static final String ACCOUNT_NAME = "ACCOUNT_NAME"; private static final String TAG = "FileDownloader"; @@ -63,8 +68,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis /** * Builds a key for mDownloadsInProgress from the accountName and remotePath */ - private static String buildRemoteName(String accountName, String remotePath) { - return accountName + remotePath; + private String buildRemoteName(Account account, OCFile file) { + return account.name + file.getRemotePath(); } public static final String getSavePath(String accountName) { @@ -105,21 +110,20 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis @Override public int onStartCommand(Intent intent, int flags, int startId) { if ( !intent.hasExtra(EXTRA_ACCOUNT) || - !intent.hasExtra(EXTRA_FILE_PATH) || - !intent.hasExtra(EXTRA_REMOTE_PATH) + !intent.hasExtra(EXTRA_FILE) + /*!intent.hasExtra(EXTRA_FILE_PATH) || + !intent.hasExtra(EXTRA_REMOTE_PATH)*/ ) { Log.e(TAG, "Not enough information provided in intent"); return START_NOT_STICKY; } Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); - String filePath = intent.getStringExtra(EXTRA_FILE_PATH); - String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH); - long totalDownloadSize = intent.getLongExtra(EXTRA_FILE_SIZE, -1); - - AbstractList requestedDownloads = new Vector(); // dvelasco: now this will always contain just one element, but that can change in a near future - String downloadKey = buildRemoteName(account.name, remotePath); + OCFile file = intent.getParcelableExtra(EXTRA_FILE); + + AbstractList requestedDownloads = new Vector(); // dvelasco: now this always contains just one element, but that can change in a near future (download of multiple selection) + String downloadKey = buildRemoteName(account, file); try { - DownloadFileOperation newDownload = new DownloadFileOperation(account, filePath, remotePath, (String)null, totalDownloadSize, false); + DownloadFileOperation newDownload = new DownloadFileOperation(account, file); mPendingDownloads.putIfAbsent(downloadKey, newDownload); newDownload.addDatatransferProgressListener(this); requestedDownloads.add(downloadKey); @@ -162,12 +166,12 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis * Cancels a pending or current download of a remote file. * * @param account Owncloud account where the remote file is stored. - * @param remotePath URL to the remote file in the queue of downloads. + * @param file A file in the queue of pending downloads */ - public void cancel(Account account, String remotePath) { + public void cancel(Account account, OCFile file) { DownloadFileOperation download = null; synchronized (mPendingDownloads) { - download = mPendingDownloads.remove(buildRemoteName(account.name, remotePath)); + download = mPendingDownloads.remove(buildRemoteName(account, file)); } if (download != null) { download.cancel(); @@ -179,15 +183,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis * Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading * * @param account Owncloud account where the remote file is stored. - * @param remotePath URL to the remote file in the queue of downloads. + * @param file A file in the queue of downloads. */ - public boolean isDownloading(Account account, String remotePath) { + public boolean isDownloading(Account account, OCFile file) { synchronized (mPendingDownloads) { - return (mPendingDownloads.containsKey(buildRemoteName(account.name, remotePath))); + return (mPendingDownloads.containsKey(buildRemoteName(account, file))); } } } + /** * Download worker. Performs the pending downloads in the order they were requested. * @@ -236,35 +241,31 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis } /// perform the download - //mDownloadsInProgress.add(buildRemoteName(mLastAccount.name, mCurrentDownload.getRemotePath())); RemoteOperationResult downloadResult = null; - File newLocalFile = null; - //try { + try { downloadResult = mCurrentDownload.execute(mDownloadClient); if (downloadResult.isSuccess()) { ContentValues cv = new ContentValues(); - newLocalFile = new File(getSavePath(mCurrentDownload.getAccount().name) + mCurrentDownload.getLocalPath()); - cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newLocalFile.getAbsolutePath()); + cv.put(ProviderTableMeta.FILE_STORAGE_PATH, mCurrentDownload.getSavePath()); getContentResolver().update( ProviderTableMeta.CONTENT_URI, cv, ProviderTableMeta.FILE_NAME + "=? AND " + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?", new String[] { - mCurrentDownload.getLocalPath().substring(mCurrentDownload.getLocalPath().lastIndexOf('/') + 1), + mCurrentDownload.getSavePath().substring(mCurrentDownload.getSavePath().lastIndexOf('/') + 1), mLastAccount.name }); } - /*} finally { - mDownloadsInProgress.remove(buildRemoteName(mLastAccount.name, mCurrentDownload.getRemotePath())); - }*/ - - mPendingDownloads.remove(downloadKey); + } finally { + mPendingDownloads.remove(downloadKey); + } + /// notify result notifyDownloadResult(mCurrentDownload, downloadResult); - sendFinalBroadcast(mCurrentDownload, downloadResult, (downloadResult.isSuccess())? newLocalFile.getAbsolutePath():null); + sendFinalBroadcast(mCurrentDownload, downloadResult); } } @@ -305,10 +306,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis mNotification.flags |= Notification.FLAG_ONGOING_EVENT; mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout); mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, download.getSize() == -1); - mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getLocalPath()).getName())); + mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getSavePath()).getName())); mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon); - // TODO put something smart in the contentIntent below - mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); + + /// includes a pending intent in the notification showing the details view of the file + Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, download.getFile()); + showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, download.getAccount()); + showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, showDetailsIntent, PendingIntent.FLAG_UPDATE_CURRENT); + mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification); } @@ -328,7 +335,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis finalNotification.flags |= Notification.FLAG_AUTO_CANCEL; // TODO put something smart in the contentIntent below finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); - finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getLocalPath()).getName()), finalNotification.contentIntent); + finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getSavePath()).getName()), finalNotification.contentIntent); mNotificationMngr.notify(tickerId, finalNotification); } } @@ -339,15 +346,14 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis * * @param download Finished download operation * @param downloadResult Result of the download operation - * @param newFilePath Absolute path to the downloaded file */ - private void sendFinalBroadcast(DownloadFileOperation download, RemoteOperationResult downloadResult, String newFilePath) { + private void sendFinalBroadcast(DownloadFileOperation download, RemoteOperationResult downloadResult) { Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE); end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess()); end.putExtra(ACCOUNT_NAME, download.getAccount().name); end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath()); if (downloadResult.isSuccess()) { - end.putExtra(EXTRA_FILE_PATH, newFilePath); + end.putExtra(EXTRA_FILE_PATH, download.getSavePath()); } sendBroadcast(end); } diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index c41db782..f3ce4b10 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -31,6 +31,7 @@ import org.apache.commons.httpclient.HttpException; 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; @@ -52,74 +53,68 @@ public class DownloadFileOperation extends RemoteOperation { 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 mDataTransferListeners = new HashSet(); - 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) { @@ -127,15 +122,15 @@ public class DownloadFileOperation extends RemoteOperation { 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); } @@ -143,11 +138,11 @@ public class DownloadFileOperation extends RemoteOperation { 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; @@ -162,7 +157,7 @@ public class DownloadFileOperation extends RemoteOperation { 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 it = null; FileOutputStream fos = null; @@ -187,7 +182,7 @@ public class DownloadFileOperation extends RemoteOperation { 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; @@ -210,5 +205,5 @@ public class DownloadFileOperation extends RemoteOperation { public void cancel() { mCancellationRequested.set(true); // atomic set; there is no need of synchronizing it } - + } diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index 5f59475a..e55d6186 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -207,9 +207,10 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { .getModificationTimestamp()) { Intent intent = new Intent(this.getContext(), FileDownloader.class); intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount()); - intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath()); + intent.putExtra(FileDownloader.EXTRA_FILE, file); + /*intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath()); intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath()); - intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength()); + intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());*/ file.setKeepInSync(true); getContext().startService(intent); } diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 6b28f098..b88368fe 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -123,7 +123,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2); //if (FileDownloader.isDownloading(mAccount, file.getRemotePath())) { FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder(); - if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file.getRemotePath())) { + if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) { localStateView.setImageResource(R.drawable.downloading_file_indicator); localStateView.setVisibility(View.VISIBLE); } else if (FileUploader.isUploading(mAccount, file.getRemotePath())) { diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index 91980e5f..c84e2cff 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -245,8 +245,8 @@ public class FileDetailFragment extends SherlockFragment implements case R.id.fdDownloadBtn: { //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) { FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder(); - if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile.getRemotePath())) { - downloaderBinder.cancel(mAccount, mFile.getRemotePath()); + if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) { + downloaderBinder.cancel(mAccount, mFile); if (mFile.isDown()) { setButtonsForDown(); } else { @@ -256,9 +256,10 @@ public class FileDetailFragment extends SherlockFragment implements } else { Intent i = new Intent(getActivity(), FileDownloader.class); i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount); - i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath()); + i.putExtra(FileDownloader.EXTRA_FILE, mFile); + /*i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath()); i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath()); - i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength()); + i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());*/ // update ui setButtonsForTransferring(); @@ -443,7 +444,7 @@ public class FileDetailFragment extends SherlockFragment implements // configure UI for depending upon local state of the file //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) { FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder(); - if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile.getRemotePath())) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) { + if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) { setButtonsForTransferring(); } else if (mFile.isDown()) {