X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a238d0635ad16d6adc97d08ef0fa89b8afb18b46..9ae0e1746ad60925dc18e19d2f63f5780ec75872:/src/eu/alefzero/owncloud/files/services/FileDownloader.java diff --git a/src/eu/alefzero/owncloud/files/services/FileDownloader.java b/src/eu/alefzero/owncloud/files/services/FileDownloader.java index c147c9d2..b0dd2b26 100644 --- a/src/eu/alefzero/owncloud/files/services/FileDownloader.java +++ b/src/eu/alefzero/owncloud/files/services/FileDownloader.java @@ -1,7 +1,6 @@ package eu.alefzero.owncloud.files.services; import java.io.File; -import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -14,6 +13,7 @@ import android.app.PendingIntent; import android.app.Service; import android.content.ContentValues; import android.content.Intent; +import android.net.Uri; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; @@ -23,12 +23,10 @@ import android.os.Message; import android.os.Process; import android.util.Log; import android.widget.RemoteViews; -import android.widget.Toast; import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta; import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener; -import eu.alefzero.owncloud.syncadapter.FileSyncService; import eu.alefzero.webdav.WebdavClient; public class FileDownloader extends Service implements OnDatatransferProgressListener { @@ -38,7 +36,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis 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"; + public static final String ACCOUNT_NAME = "ACCOUNT_NAME"; + private static final String TAG = "FileDownloader"; private NotificationManager mNotificationMngr; @@ -49,7 +48,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis private String mRemotePath; private int mLastPercent; private long mTotalDownloadSize; - private long mCurrentDownlodSize; + private long mCurrentDownloadSize; private Notification mNotification; /** @@ -84,14 +83,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis } } - public static final String getSavePath() { + public static final String getSavePath(String accountName) { File sdCard = Environment.getExternalStorageDirectory(); - return sdCard.getAbsolutePath() + "/owncloud/"; + return sdCard.getAbsolutePath() + "/owncloud/" + Uri.encode(accountName, "@"); + // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B } - public static final String getTemporalPath() { + public static final String getTemporalPath(String accountName) { File sdCard = Environment.getExternalStorageDirectory(); - return sdCard.getAbsolutePath() + "/owncloud.tmp/"; + return sdCard.getAbsolutePath() + "/owncloud/tmp/" + Uri.encode(accountName, "@"); + // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B } @Override @@ -112,114 +113,140 @@ 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)) { + if ( !intent.hasExtra(EXTRA_ACCOUNT) || + !intent.hasExtra(EXTRA_FILE_PATH) || + !intent.hasExtra(EXTRA_REMOTE_PATH) + ) { Log.e(TAG, "Not enough information provided in intent"); - return START_STICKY; + return START_NOT_STICKY; } mAccount = intent.getParcelableExtra(EXTRA_ACCOUNT); mFilePath = intent.getStringExtra(EXTRA_FILE_PATH); mRemotePath = intent.getStringExtra(EXTRA_REMOTE_PATH); + mTotalDownloadSize = intent.getLongExtra(EXTRA_FILE_SIZE, -1); + mCurrentDownloadSize = mLastPercent = 0; + Message msg = mServiceHandler.obtainMessage(); msg.arg1 = startId; mServiceHandler.sendMessage(msg); - mCurrentDownlodSize = mLastPercent = 0; - mTotalDownloadSize = intent.getLongExtra(EXTRA_FILE_SIZE, -1); return START_NOT_STICKY; } - void downloadFile() { - AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE); - + /** + * Core download method: requests the file to download and stores it. + */ + private void downloadFile() { + boolean downloadResult = false; + /// prepare client object to send the request to the ownCloud server + AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE); WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext()); - String username = mAccount.name.split("@")[0]; - String password = ""; + String password = null; try { password = am.blockingGetAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE, true); } catch (Exception e) { - e.printStackTrace(); + Log.e(TAG, "Access to account credentials failed", e); + sendFinalBroadcast(downloadResult, null); return; } - wdc.setCredentials(username, password); wdc.allowSelfsignedCertificates(); wdc.setDataTransferProgressListener(this); - mNotification = new Notification(R.drawable.icon, "Downloading file", System.currentTimeMillis()); - + + /// download will be in a temporal file + File tmpFile = new File(getTemporalPath(mAccount.name) + mFilePath); + + /// create status notification to show the download progress + mNotification = new Notification(R.drawable.icon, getString(R.string.downloader_download_in_progress_ticker), System.currentTimeMillis()); 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, mTotalDownloadSize == -1); + mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, tmpFile.getName())); mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon); - // dvelasco ; contentIntent MUST be assigned to avoid app crashes in versions previous to Android 4.x ; - // BUT an empty Intent is not a very elegant solution; something smart should happen when a user 'clicks' on a download in the notification bar + // TODO put something smart in the contentIntent below mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); + mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification); - mNotificationMngr.notify(1, mNotification); - // download in a temporal file - File tmpFile = new File(getTemporalPath() + mAccount.name + mFilePath); + /// perform the download tmpFile.getParentFile().mkdirs(); mDownloadsInProgress.put(buildRemoteName(mAccount.name, mRemotePath), tmpFile.getAbsolutePath()); - - boolean download_result = false; File newFile = null; - if (wdc.downloadFile(mRemotePath, tmpFile)) { - newFile = new File(getSavePath() + mAccount.name + mFilePath); - newFile.getParentFile().mkdirs(); - boolean moved = tmpFile.renameTo(newFile); + try { + if (wdc.downloadFile(mRemotePath, tmpFile)) { + newFile = new File(getSavePath(mAccount.name) + mFilePath); + newFile.getParentFile().mkdirs(); + boolean moved = tmpFile.renameTo(newFile); - if (moved) { - ContentValues cv = new ContentValues(); - cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newFile.getAbsolutePath()); - getContentResolver().update( - ProviderTableMeta.CONTENT_URI, - cv, - ProviderTableMeta.FILE_NAME + "=? AND " - + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?", - new String[] { - mFilePath.substring(mFilePath.lastIndexOf('/') + 1), - mAccount.name }); - download_result = true; + if (moved) { + ContentValues cv = new ContentValues(); + cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newFile.getAbsolutePath()); + getContentResolver().update( + ProviderTableMeta.CONTENT_URI, + cv, + ProviderTableMeta.FILE_NAME + "=? AND " + + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?", + new String[] { + mFilePath.substring(mFilePath.lastIndexOf('/') + 1), + mAccount.name }); + downloadResult = true; + } } + } finally { + mDownloadsInProgress.remove(buildRemoteName(mAccount.name, mRemotePath)); } - - mDownloadsInProgress.remove(buildRemoteName(mAccount.name, mRemotePath)); - - mNotificationMngr.cancel(1); - Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE); - end.putExtra(EXTRA_DOWNLOAD_RESULT, download_result); - end.putExtra(ACCOUNT_NAME, mAccount.name); - end.putExtra(EXTRA_REMOTE_PATH, mRemotePath); - if (download_result) { - end.putExtra(EXTRA_FILE_PATH, newFile.getAbsolutePath()); - } - sendBroadcast(end); - if (download_result) { - Toast.makeText(this, R.string.downloader_download_succeed , Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(this, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show(); - } + /// notify result + mNotificationMngr.cancel(R.string.downloader_download_in_progress_ticker); + int tickerId = (downloadResult) ? R.string.downloader_download_succeeded_ticker : R.string.downloader_download_failed_ticker; + int contentId = (downloadResult) ? R.string.downloader_download_succeeded_content : R.string.downloader_download_failed_content; + Notification finalNotification = new Notification(R.drawable.icon, getString(tickerId), System.currentTimeMillis()); + 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), tmpFile.getName()), finalNotification.contentIntent); + mNotificationMngr.notify(tickerId, finalNotification); + + sendFinalBroadcast(downloadResult, (downloadResult)?newFile.getAbsolutePath():null); } + /** + * Callback method to update the progress bar in the status notification. + */ @Override public void transferProgress(long progressRate) { - mCurrentDownlodSize += progressRate; - int percent = (int)(100.0*((double)mCurrentDownlodSize)/((double)mTotalDownloadSize)); + mCurrentDownloadSize += progressRate; + int percent = (int)(100.0*((double)mCurrentDownloadSize)/((double)mTotalDownloadSize)); if (percent != mLastPercent) { - mNotification.contentView.setProgressBar(R.id.status_progress, 100, (int)(100*mCurrentDownlodSize/mTotalDownloadSize), mTotalDownloadSize == -1); - mNotification.contentView.setTextViewText(R.id.status_text, percent+"%"); - mNotificationMngr.notify(1, mNotification); + mNotification.contentView.setProgressBar(R.id.status_progress, 100, (int)(100*mCurrentDownloadSize/mTotalDownloadSize), mTotalDownloadSize == -1); + mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), percent, new File(mFilePath).getName())); + mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification); } mLastPercent = percent; } - + + /** + * Sends a broadcast in order to the interested activities can update their view + * + * @param downloadResult 'True' if the download was successful + * @param newFilePath Absolute path to the download file + */ + private void sendFinalBroadcast(boolean downloadResult, String newFilePath) { + Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE); + end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult); + end.putExtra(ACCOUNT_NAME, mAccount.name); + end.putExtra(EXTRA_REMOTE_PATH, mRemotePath); + if (downloadResult) { + end.putExtra(EXTRA_FILE_PATH, newFilePath); + } + sendBroadcast(end); + } + }