X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ba148a82782bba94b95b8acd2ecb19af797fa84a..b0ab3ce0872d2702e82b5979dddaa5a897be340b:/src/com/owncloud/android/files/services/FileUploader.java diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 10f05c48..42033beb 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -1,23 +1,40 @@ package com.owncloud.android.files.services; import java.io.File; +import java.util.AbstractList; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; +import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import com.owncloud.android.authenticator.AccountAuthenticator; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.files.PhotoTakenBroadcastReceiver; +import com.owncloud.android.files.InstantUploadBroadcastReceiver; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; +import com.owncloud.android.operations.ChunkedUploadFileOperation; +import com.owncloud.android.operations.DownloadFileOperation; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.UploadFileOperation; +import com.owncloud.android.ui.activity.FileDetailActivity; +import com.owncloud.android.ui.fragment.FileDetailFragment; +import com.owncloud.android.utils.OwnCloudVersion; import eu.alefzero.webdav.OnDatatransferProgressListener; -import com.owncloud.android.utils.OwnCloudClientUtils; + +import com.owncloud.android.network.OwnCloudClientUtils; import android.accounts.Account; +import android.accounts.AccountManager; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; import android.content.Intent; +import android.os.Binder; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -25,8 +42,8 @@ import android.os.Looper; import android.os.Message; import android.os.Process; import android.util.Log; -import android.webkit.MimeTypeMap; import android.widget.RemoteViews; + import com.owncloud.android.R; import eu.alefzero.webdav.WebdavClient; @@ -50,59 +67,60 @@ public class FileUploader extends Service implements OnDatatransferProgressListe public static final int UPLOAD_SINGLE_FILE = 0; public static final int UPLOAD_MULTIPLE_FILES = 1; - private static final String TAG = "FileUploader"; + private static final String TAG = FileUploader.class.getSimpleName(); - private NotificationManager mNotificationManager; private Looper mServiceLooper; private ServiceHandler mServiceHandler; - private Account mAccount; - private String[] mLocalPaths, mRemotePaths, mMimeTypes; - private int mUploadType; + private IBinder mBinder; + private WebdavClient mUploadClient = null; + private Account mLastAccount = null, mLastAccountWhereInstantFolderWasCreated = null; + private FileDataStorageManager mStorageManager; + + //private AbstractList mAccounts = new Vector(); + //private AbstractList mUploads = new Vector(); + //private int mCurrentIndexUpload; + private ConcurrentMap mPendingUploads = new ConcurrentHashMap(); + private UploadFileOperation mCurrentUpload = null; + + private NotificationManager mNotificationManager; private Notification mNotification; - private long mTotalDataToSend, mSendData; - private int mCurrentIndexUpload, mPreviousPercent; - private int mSuccessCounter; - private boolean mIsInstant; + private int mLastPercent; + private RemoteViews mDefaultNotificationContentView; + /*private long mTotalDataToSend, mSendData; + private int mTotalFilesToSend, mPreviousPercent; + private int mSuccessCounter;*/ - /** - * Static map with the files being download and the path to the temporal file were are download - */ - private static Map mUploadsInProgress = Collections.synchronizedMap(new HashMap()); /** - * Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading + * Builds a key for mPendingUploads from the account and file to upload + * + * @param account Account where the file to download is stored + * @param file File to download */ - public static boolean isUploading(Account account, String remotePath) { - return (mUploadsInProgress.get(buildRemoteName(account.name, remotePath)) != null); + private String buildRemoteName(Account account, OCFile file) { + return account.name + file.getRemotePath(); } + + private String buildRemoteName(Account account, String remotePath) { + return account.name + remotePath; + } + /** - * Builds a key for mUplaodsInProgress from the accountName and remotePath + * Checks if an ownCloud server version should support chunked uploads. + * + * @param version OwnCloud version instance corresponding to an ownCloud server. + * @return 'True' if the ownCloud server with version supports chunked uploads. */ - private static String buildRemoteName(String accountName, String remotePath) { - return accountName + remotePath; + private static boolean chunkedUploadIsSupported(OwnCloudVersion version) { + return (version != null && version.compareTo(OwnCloudVersion.owncloud_v4_5) >= 0); } - - - @Override - public IBinder onBind(Intent arg0) { - return null; - } - - private final class ServiceHandler extends Handler { - public ServiceHandler(Looper looper) { - super(looper); - } - - @Override - public void handleMessage(Message msg) { - uploadFile(msg.arg2==1?true:false); - stopSelf(msg.arg1); - } - } + /** + * Service initialization + */ @Override public void onCreate() { super.onCreate(); @@ -111,246 +129,418 @@ public class FileUploader extends Service implements OnDatatransferProgressListe Process.THREAD_PRIORITY_BACKGROUND); thread.start(); mServiceLooper = thread.getLooper(); - mServiceHandler = new ServiceHandler(mServiceLooper); + mServiceHandler = new ServiceHandler(mServiceLooper, this); + mBinder = new FileUploaderBinder(); } + + /** + * Entry point to add one or several files to the queue of uploads. + * + * New uploads are added calling to startService(), resulting in a call to this method. This ensures the service will keep on working + * although the caller activity goes away. + */ @Override public int onStartCommand(Intent intent, int flags, int startId) { - if (!intent.hasExtra(KEY_ACCOUNT) && !intent.hasExtra(KEY_UPLOAD_TYPE)) { + if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE)) { Log.e(TAG, "Not enough information provided in intent"); return Service.START_NOT_STICKY; } - mAccount = intent.getParcelableExtra(KEY_ACCOUNT); - mUploadType = intent.getIntExtra(KEY_UPLOAD_TYPE, -1); - if (mUploadType == -1) { + int uploadType = intent.getIntExtra(KEY_UPLOAD_TYPE, -1); + if (uploadType == -1) { Log.e(TAG, "Incorrect upload type provided"); return Service.START_NOT_STICKY; } - if (mUploadType == UPLOAD_SINGLE_FILE) { - mLocalPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) }; - mRemotePaths = new String[] { intent + Account account = intent.getParcelableExtra(KEY_ACCOUNT); + + String[] localPaths, remotePaths, mimeTypes; + if (uploadType == UPLOAD_SINGLE_FILE) { + localPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) }; + remotePaths = new String[] { intent .getStringExtra(KEY_REMOTE_FILE) }; - mMimeTypes = new String[] { intent.getStringExtra(KEY_MIME_TYPE) }; + mimeTypes = new String[] { intent.getStringExtra(KEY_MIME_TYPE) }; } else { // mUploadType == UPLOAD_MULTIPLE_FILES - mLocalPaths = intent.getStringArrayExtra(KEY_LOCAL_FILE); - mRemotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE); - mMimeTypes = intent.getStringArrayExtra(KEY_MIME_TYPE); + localPaths = intent.getStringArrayExtra(KEY_LOCAL_FILE); + remotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE); + mimeTypes = intent.getStringArrayExtra(KEY_MIME_TYPE); } - - if (mLocalPaths.length != mRemotePaths.length) { + + if (localPaths == null) { + Log.e(TAG, "Incorrect array for local paths provided in upload intent"); + return Service.START_NOT_STICKY; + } + if (remotePaths == null) { + Log.e(TAG, "Incorrect array for remote paths provided in upload intent"); + return Service.START_NOT_STICKY; + } + + if (localPaths.length != remotePaths.length) { Log.e(TAG, "Different number of remote paths and local paths!"); return Service.START_NOT_STICKY; } - - mIsInstant = intent.getBooleanExtra(KEY_INSTANT_UPLOAD, false); - - Message msg = mServiceHandler.obtainMessage(); - msg.arg1 = startId; - msg.arg2 = intent.getBooleanExtra(KEY_FORCE_OVERWRITE, false)?1:0; - mServiceHandler.sendMessage(msg); + + boolean isInstant = intent.getBooleanExtra(KEY_INSTANT_UPLOAD, false); + boolean forceOverwrite = intent.getBooleanExtra(KEY_FORCE_OVERWRITE, false); + + OwnCloudVersion ocv = new OwnCloudVersion(AccountManager.get(this).getUserData(account, AccountAuthenticator.KEY_OC_VERSION)); + boolean chunked = FileUploader.chunkedUploadIsSupported(ocv); + AbstractList requestedUploads = new Vector(); + String uploadKey = null; + UploadFileOperation newUpload = null; + try { + for (int i=0; i < localPaths.length; i++) { + uploadKey = buildRemoteName(account, remotePaths[i]); + if (chunked) { + newUpload = new ChunkedUploadFileOperation(account, localPaths[i], remotePaths[i], ((mimeTypes!=null)?mimeTypes[i]:(String)null), isInstant, forceOverwrite); + } else { + newUpload = new UploadFileOperation(account, localPaths[i], remotePaths[i], (mimeTypes!=null?mimeTypes[i]:(String)null), isInstant, forceOverwrite); + } + mPendingUploads.putIfAbsent(uploadKey, newUpload); + newUpload.addDatatransferProgressListener(this); + requestedUploads.add(uploadKey); + } + + } catch (IllegalArgumentException e) { + Log.e(TAG, "Not enough information provided in intent: " + e.getMessage()); + return START_NOT_STICKY; + } + + if (requestedUploads.size() > 0) { + Message msg = mServiceHandler.obtainMessage(); + msg.arg1 = startId; + msg.obj = requestedUploads; + mServiceHandler.sendMessage(msg); + } return Service.START_NOT_STICKY; } /** - * Core upload method: sends the file(s) to upload + * Provides a binder object that clients can use to perform operations on the queue of uploads, excepting the addition of new files. + * + * Implemented to perform cancellation, pause and resume of existing uploads. */ - public void uploadFile(boolean force_override) { - FileDataStorageManager storageManager = new FileDataStorageManager(mAccount, getContentResolver()); + @Override + public IBinder onBind(Intent arg0) { + return mBinder; + } - mTotalDataToSend = mSendData = mPreviousPercent = 0; + /** + * Binder to let client components to perform operations on the queue of uploads. + * + * It provides by itself the available operations. + */ + public class FileUploaderBinder extends Binder { - /// prepare client object to send the request to the ownCloud server - WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext()); - wc.setDataTransferProgressListener(this); - - /// create status notification to show the upload progress - mNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker), System.currentTimeMillis()); - mNotification.flags |= Notification.FLAG_ONGOING_EVENT; - RemoteViews oldContentView = mNotification.contentView; - mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout); - mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, false); - 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 an upload in the notification bar - mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); - mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); - - /// create remote folder for instant uploads if necessary - if (mIsInstant) { - OCFile instantUploadDir = storageManager.getFileByPath(PhotoTakenBroadcastReceiver.INSTANT_UPLOAD_DIR); - if (instantUploadDir == null) { - wc.createDirectory(PhotoTakenBroadcastReceiver.INSTANT_UPLOAD_DIR); // fail could just mean that it already exists, but local database is not synchronized; the upload will be started anyway - OCFile newDir = new OCFile(PhotoTakenBroadcastReceiver.INSTANT_UPLOAD_DIR); - newDir.setMimetype("DIR"); - newDir.setParentId(storageManager.getFileByPath(OCFile.PATH_SEPARATOR).getFileId()); - storageManager.saveFile(newDir); + /** + * Cancels a pending or current upload of a remote file. + * + * @param account Owncloud account where the remote file will be stored. + * @param file A file in the queue of pending uploads + */ + public void cancel(Account account, OCFile file) { + UploadFileOperation upload = null; + synchronized (mPendingUploads) { + upload = mPendingUploads.remove(buildRemoteName(account, file)); + } + if (upload != null) { + // TODO upload.cancel(); } } - /// perform the upload - File [] localFiles = new File[mLocalPaths.length]; - for (int i = 0; i < mLocalPaths.length; ++i) { - localFiles[i] = new File(mLocalPaths[i]); - mTotalDataToSend += localFiles[i].length(); + + /** + * Returns True when the file described by 'file' is being uploaded to the ownCloud account 'account' or waiting for it + * + * @param account Owncloud account where the remote file will be stored. + * @param file A file that could be in the queue of pending uploads + */ + public boolean isUploading(Account account, OCFile file) { + synchronized (mPendingUploads) { + return (mPendingUploads.containsKey(buildRemoteName(account, file))); + } + } + } + + + + + /** + * Upload worker. Performs the pending uploads in the order they were requested. + * + * Created with the Looper of a new thread, started in {@link FileUploader#onCreate()}. + */ + private static class ServiceHandler extends Handler { + // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak + FileUploader mService; + public ServiceHandler(Looper looper, FileUploader service) { + super(looper); + if (service == null) + throw new IllegalArgumentException("Received invalid NULL in parameter 'service'"); + mService = service; } - Log.d(TAG, "Will upload " + mTotalDataToSend + " bytes, with " + mLocalPaths.length + " files"); - mSuccessCounter = 0; - for (int i = 0; i < mLocalPaths.length; ++i) { - String mimeType = (mMimeTypes != null) ? mMimeTypes[i] : null; - if (mimeType == null) { - try { - mimeType = MimeTypeMap.getSingleton() - .getMimeTypeFromExtension( - mLocalPaths[i].substring(mLocalPaths[i] - .lastIndexOf('.') + 1)); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Trying to find out MIME type of a file without extension: " + mLocalPaths[i]); + + @Override + public void handleMessage(Message msg) { + @SuppressWarnings("unchecked") + AbstractList requestedUploads = (AbstractList) msg.obj; + if (msg.obj != null) { + Iterator it = requestedUploads.iterator(); + while (it.hasNext()) { + mService.uploadFile(it.next()); } } - if (mimeType == null) - mimeType = "application/octet-stream"; - mCurrentIndexUpload = i; + mService.stopSelf(msg.arg1); + } + } + + + + + /** + * Core upload method: sends the file(s) to upload + * + * @param uploadKey Key to access the upload to perform, contained in mPendingUploads + */ + public void uploadFile(String uploadKey) { + + synchronized(mPendingUploads) { + mCurrentUpload = mPendingUploads.get(uploadKey); + } + + if (mCurrentUpload != null) { + + /// prepare upload statistics + /*mTotalDataToSend = mSendData = mPreviousPercent = 0; + Iterator it = mUploads.iterator(); + while (it.hasNext()) { + mTotalDataToSend += new File(it.next().getLocalPath()).length(); + } + mTotalFilesToSend = mUploads.size(); + Log.d(TAG, "Will upload " + mTotalDataToSend + " bytes, with " + mUploads.size() + " files");*/ + + + notifyUploadStart(mCurrentUpload); + + + /// prepare client object to send requests to the ownCloud server + if (mUploadClient == null || !mLastAccount.equals(mCurrentUpload.getAccount())) { + mLastAccount = mCurrentUpload.getAccount(); + mStorageManager = new FileDataStorageManager(mLastAccount, getContentResolver()); + mUploadClient = OwnCloudClientUtils.createOwnCloudClient(mLastAccount, getApplicationContext()); + } + + /// create remote folder for instant uploads, "if necessary" (would be great that HEAD to a folder worked as with files, we should check; but it's not WebDAV standard, anyway + if (mCurrentUpload.isInstant() && !mLastAccountWhereInstantFolderWasCreated.equals(mCurrentUpload.getAccount())) { + mLastAccountWhereInstantFolderWasCreated = mCurrentUpload.getAccount(); + createRemoteFolderForInstantUploads(mUploadClient, mStorageManager); + } + + /// perform the upload + RemoteOperationResult uploadResult = null; long parentDirId = -1; - boolean uploadResult = false; - String availablePath = mRemotePaths[i]; - if (!force_override) - availablePath = getAvailableRemotePath(wc, mRemotePaths[i]); try { - File f = new File(mRemotePaths[i]); - parentDirId = storageManager.getFileByPath(f.getParent().endsWith("/")?f.getParent():f.getParent()+"/").getFileId(); - if(availablePath != null) { - mRemotePaths[i] = availablePath; - mUploadsInProgress.put(buildRemoteName(mAccount.name, mRemotePaths[i]), mLocalPaths[i]); - if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) { - OCFile new_file = new OCFile(mRemotePaths[i]); - new_file.setMimetype(mimeType); - new_file.setFileLength(localFiles[i].length()); - new_file.setModificationTimestamp(System.currentTimeMillis()); - new_file.setLastSyncDate(0); - new_file.setStoragePath(mLocalPaths[i]); - new_file.setParentId(parentDirId); - if (force_override) - new_file.setKeepInSync(true); - storageManager.saveFile(new_file); - mSuccessCounter++; - uploadResult = true; - } + File remote = new File(mCurrentUpload.getRemotePath()); + parentDirId = mStorageManager.getFileByPath(remote.getParent().endsWith("/")?remote.getParent():remote.getParent()+"/").getFileId(); + File local = new File(mCurrentUpload.getLocalPath()); + long size = local.length(); + uploadResult = mCurrentUpload.execute(mUploadClient); + if (uploadResult.isSuccess()) { + saveNewOCFile(mCurrentUpload, mStorageManager, parentDirId, size); } - } finally { - mUploadsInProgress.remove(buildRemoteName(mAccount.name, mRemotePaths[i])); - /// notify upload (or fail) of EACH file to activities interested - Intent end = new Intent(UPLOAD_FINISH_MESSAGE); - end.putExtra(EXTRA_PARENT_DIR_ID, parentDirId); - end.putExtra(EXTRA_UPLOAD_RESULT, uploadResult); - end.putExtra(EXTRA_REMOTE_PATH, mRemotePaths[i]); - end.putExtra(EXTRA_FILE_PATH, mLocalPaths[i]); - end.putExtra(ACCOUNT_NAME, mAccount.name); - sendBroadcast(end); + } finally { + synchronized(mPendingUploads) { + mPendingUploads.remove(uploadKey); + } } + + /// notify result + notifyUploadResult(uploadResult, mCurrentUpload); + sendFinalBroadcast(mCurrentUpload, uploadResult, parentDirId); + + } + + } + + /** + * Create remote folder for instant uploads if necessary. + * + * @param client WebdavClient to the ownCloud server. + * @param storageManager Interface to the local database caching the data in the server. + * @return 'True' if the folder exists when the methods finishes. + */ + private boolean createRemoteFolderForInstantUploads(WebdavClient client, FileDataStorageManager storageManager) { + boolean result = true; + OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR); + if (instantUploadDir == null) { + result = client.createDirectory(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR); // fail could just mean that it already exists, but local database is not synchronized; the upload will be started anyway + OCFile newDir = new OCFile(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR); + newDir.setMimetype("DIR"); + newDir.setParentId(storageManager.getFileByPath(OCFile.PATH_SEPARATOR).getFileId()); + storageManager.saveFile(newDir); } + return result; + } + + /** + * Saves a new OC File after a successful upload. + * + * @param upload Upload operation completed. + * @param storageManager Interface to the database where the new OCFile has to be stored. + * @param parentDirId Id of the parent OCFile. + * @param size Size of the file. + */ + private void saveNewOCFile(UploadFileOperation upload, FileDataStorageManager storageManager, long parentDirId, long size) { + OCFile newFile = new OCFile(upload.getRemotePath()); + newFile.setMimetype(upload.getMimeType()); + newFile.setFileLength(size); + newFile.setModificationTimestamp(System.currentTimeMillis()); + newFile.setLastSyncDate(0); + newFile.setStoragePath(upload.getLocalPath()); + newFile.setParentId(parentDirId); + if (upload.getForceOverwrite()) + newFile.setKeepInSync(true); + storageManager.saveFile(newFile); + } + + /** + * Creates a status notification to show the upload progress + * + * @param upload Upload operation starting. + */ + private void notifyUploadStart(UploadFileOperation upload) { + /// create status notification with a progress bar + mLastPercent = 0; + mNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker), System.currentTimeMillis()); + mNotification.flags |= Notification.FLAG_ONGOING_EVENT; + mDefaultNotificationContentView = mNotification.contentView; + mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout); + mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, false); + mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.uploader_upload_in_progress_content), 0, new File(upload.getLocalPath()).getName())); + mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon); + + /// includes a pending intent in the notification showing the details view of the file + /* TODO + Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, upload.getFile()); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, upload.getAccount()); + showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, showDetailsIntent, PendingIntent.FLAG_UPDATE_CURRENT); + */ - /// notify final result - if (mSuccessCounter == mLocalPaths.length) { // success - //Notification finalNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_succeeded_ticker), System.currentTimeMillis()); + mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); + } + + + /** + * Callback method to update the progress bar in the status notification + */ + @Override + public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) { + int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer)); + if (percent != mLastPercent) { + mNotification.contentView.setProgressBar(R.id.status_progress, 100, percent, false); + String text = String.format(getString(R.string.uploader_upload_in_progress_content), percent, fileName); + mNotification.contentView.setTextViewText(R.id.status_text, text); + mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); + } + mLastPercent = percent; + } + + + /** + * Callback method to update the progress bar in the status notification (old version) + */ + @Override + public void onTransferProgress(long progressRate) { + // NOTHING TO DO HERE ANYMORE + } + + + /** + * Updates the status notification with the result of an upload operation. + * + * @param uploadResult Result of the upload operation. + * @param upload Finished upload operation + */ + private void notifyUploadResult(RemoteOperationResult uploadResult, UploadFileOperation upload) { + if (uploadResult.isCancelled()) { + /// cancelled operation -> silent removal of progress notification + mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker); + + } else if (uploadResult.isSuccess()) { + /// success -> silent update of progress notification to success message mNotification.flags ^= Notification.FLAG_ONGOING_EVENT; // remove the ongoing flag mNotification.flags |= Notification.FLAG_AUTO_CANCEL; - mNotification.contentView = oldContentView; - // TODO put something smart in the contentIntent below - mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); - if (mLocalPaths.length == 1) { - mNotification.setLatestEventInfo( getApplicationContext(), - getString(R.string.uploader_upload_succeeded_ticker), - String.format(getString(R.string.uploader_upload_succeeded_content_single), localFiles[0].getName()), - mNotification.contentIntent); - } else { - mNotification.setLatestEventInfo( getApplicationContext(), + mNotification.contentView = mDefaultNotificationContentView; + + /// 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, upload.getFile()); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, upload.getAccount()); + showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, showDetailsIntent, PendingIntent.FLAG_UPDATE_CURRENT); + */ + + mNotification.setLatestEventInfo( getApplicationContext(), + getString(R.string.uploader_upload_succeeded_ticker), + String.format(getString(R.string.uploader_upload_succeeded_content_single), (new File(upload.getLocalPath())).getName()), + mNotification.contentIntent); + + mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); // NOT AN ERROR; uploader_upload_in_progress_ticker is the target, not a new notification + + /* Notification about multiple uploads: pending of update + mNotification.setLatestEventInfo( getApplicationContext(), getString(R.string.uploader_upload_succeeded_ticker), String.format(getString(R.string.uploader_upload_succeeded_content_multiple), mSuccessCounter), mNotification.contentIntent); - } - mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); // NOT AN ERROR; uploader_upload_in_progress_ticker is the target, not a new notification + */ } else { + /// fail -> explicit failure notification mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker); Notification finalNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_failed_ticker), 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); - if (mLocalPaths.length == 1) { - finalNotification.setLatestEventInfo( getApplicationContext(), - getString(R.string.uploader_upload_failed_ticker), - String.format(getString(R.string.uploader_upload_failed_content_single), localFiles[0].getName()), - finalNotification.contentIntent); - } else { - finalNotification.setLatestEventInfo( getApplicationContext(), + finalNotification.setLatestEventInfo( getApplicationContext(), + getString(R.string.uploader_upload_failed_ticker), + String.format(getString(R.string.uploader_upload_failed_content_single), (new File(upload.getLocalPath())).getName()), + finalNotification.contentIntent); + + mNotificationManager.notify(R.string.uploader_upload_failed_ticker, finalNotification); + + /* Notification about multiple uploads failure: pending of update + finalNotification.setLatestEventInfo( getApplicationContext(), getString(R.string.uploader_upload_failed_ticker), - String.format(getString(R.string.uploader_upload_failed_content_multiple), mSuccessCounter, mLocalPaths.length), + String.format(getString(R.string.uploader_upload_failed_content_multiple), mSuccessCounter, mTotalFilesToSend), finalNotification.contentIntent); - } - mNotificationManager.notify(R.string.uploader_upload_failed_ticker, finalNotification); + } */ } } - - /** - * Checks if remotePath does not exist in the server and returns it, or adds a suffix to it in order to avoid the server - * file is overwritten. - * - * @param string - * @return - */ - private String getAvailableRemotePath(WebdavClient wc, String remotePath) { - Boolean check = wc.existsFile(remotePath); - if (check == null) { // null means fail - return null; - } else if (!check) { - return remotePath; - } - - int pos = remotePath.lastIndexOf("."); - String suffix = ""; - String extension = ""; - if (pos >= 0) { - extension = remotePath.substring(pos+1); - remotePath = remotePath.substring(0, pos); - } - int count = 2; - while (check != null && check) { - suffix = " (" + count + ")"; - if (pos >= 0) - check = wc.existsFile(remotePath + suffix + "." + extension); - else - check = wc.existsFile(remotePath + suffix); - count++; - } - if (check == null) { - return null; - } else if (pos >=0) { - return remotePath + suffix + "." + extension; - } else { - return remotePath + suffix; - } - } /** - * Callback method to update the progress bar in the status notification. + * Sends a broadcast in order to the interested activities can update their view + * + * @param upload Finished upload operation + * @param uploadResult Result of the upload operation */ - @Override - public void transferProgress(long progressRate) { - mSendData += progressRate; - int percent = (int)(100*((double)mSendData)/((double)mTotalDataToSend)); - if (percent != mPreviousPercent) { - String text = String.format(getString(R.string.uploader_upload_in_progress_content), percent, new File(mLocalPaths[mCurrentIndexUpload]).getName()); - mNotification.contentView.setProgressBar(R.id.status_progress, 100, percent, false); - mNotification.contentView.setTextViewText(R.id.status_text, text); - mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); - } - mPreviousPercent = percent; + private void sendFinalBroadcast(UploadFileOperation upload, RemoteOperationResult uploadResult, long parentDirId) { + Intent end = new Intent(UPLOAD_FINISH_MESSAGE); + end.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath()); + end.putExtra(EXTRA_FILE_PATH, upload.getLocalPath()); + end.putExtra(ACCOUNT_NAME, upload.getAccount().name); + end.putExtra(EXTRA_UPLOAD_RESULT, uploadResult.isSuccess()); + end.putExtra(EXTRA_PARENT_DIR_ID, parentDirId); + sendBroadcast(end); } + + }