import eu.alefzero.webdav.WebdavClient;\r
\r
public class FileDownloader extends Service implements OnDatatransferProgressListener {\r
+ \r
public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
public static final String EXTRA_FILE = "FILE";\r
\r
private ConcurrentMap<String, DownloadFileOperation> mPendingDownloads = new ConcurrentHashMap<String, DownloadFileOperation>();\r
private DownloadFileOperation mCurrentDownload = null;\r
\r
- private NotificationManager mNotificationMngr;\r
+ private NotificationManager mNotificationManager;\r
private Notification mNotification;\r
private int mLastPercent;\r
\r
\r
/**\r
- * Builds a key for mDownloadsInProgress from the accountName and remotePath\r
+ * Builds a key for mPendingDownloads from the account and file to download\r
+ * \r
+ * @param account Account where the file to download is stored\r
+ * @param file File to download\r
*/\r
private String buildRemoteName(Account account, OCFile file) {\r
return account.name + file.getRemotePath();\r
@Override\r
public void onCreate() {\r
super.onCreate();\r
- mNotificationMngr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);\r
- HandlerThread thread = new HandlerThread("FileDownladerThread",\r
+ mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);\r
+ HandlerThread thread = new HandlerThread("FileDownloaderThread",\r
Process.THREAD_PRIORITY_BACKGROUND);\r
thread.start();\r
mServiceLooper = thread.getLooper();\r
- mServiceHandler = new ServiceHandler(mServiceLooper);\r
+ mServiceHandler = new ServiceHandler(mServiceLooper, this);\r
mBinder = new FileDownloaderBinder();\r
}\r
\r
\r
\r
/**\r
- * Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading\r
+ * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download\r
* \r
* @param account Owncloud account where the remote file is stored.\r
- * @param file A file in the queue of downloads.\r
+ * @param file A file that could be in the queue of downloads.\r
*/\r
public boolean isDownloading(Account account, OCFile file) {\r
synchronized (mPendingDownloads) {\r
* \r
* Created with the Looper of a new thread, started in {@link FileUploader#onCreate()}. \r
*/\r
- private final class ServiceHandler extends Handler {\r
- public ServiceHandler(Looper looper) {\r
+ private static class ServiceHandler extends Handler {\r
+ // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak\r
+ FileDownloader mService;\r
+ public ServiceHandler(Looper looper, FileDownloader service) {\r
super(looper);\r
+ if (service == null)\r
+ throw new IllegalArgumentException("Received invalid NULL in parameter 'service'");\r
+ mService = service;\r
}\r
\r
@Override\r
if (msg.obj != null) {\r
Iterator<String> it = requestedDownloads.iterator();\r
while (it.hasNext()) {\r
- downloadFile(it.next());\r
+ mService.downloadFile(it.next());\r
}\r
}\r
- stopSelf(msg.arg1);\r
+ mService.stopSelf(msg.arg1);\r
}\r
}\r
\r
notifyDownloadStart(mCurrentDownload);\r
\r
/// prepare client object to send the request to the ownCloud server\r
- if (mDownloadClient == null || mLastAccount != mCurrentDownload.getAccount()) {\r
+ if (mDownloadClient == null || !mLastAccount.equals(mCurrentDownload.getAccount())) {\r
mLastAccount = mCurrentDownload.getAccount();\r
mDownloadClient = OwnCloudClientUtils.createOwnCloudClient(mLastAccount, getApplicationContext());\r
}\r
}\r
\r
} finally {\r
- mPendingDownloads.remove(downloadKey);\r
+ synchronized(mPendingDownloads) {\r
+ mPendingDownloads.remove(downloadKey);\r
+ }\r
}\r
\r
\r
\r
\r
/**\r
- * Callback method to update the progress bar in the status notification.\r
- */\r
- @Override\r
- public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {\r
- int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer));\r
- if (percent != mLastPercent) {\r
- mNotification.contentView.setProgressBar(R.id.status_progress, 100, percent, totalToTransfer == -1);\r
- mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), percent, fileName));\r
- mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification);\r
- }\r
- mLastPercent = percent;\r
- }\r
- \r
- \r
- /**\r
- * Callback method to update the progress bar in the status notification (old version)\r
- */\r
- @Override\r
- public void onTransferProgress(long progressRate) {\r
- // NOTHING TO DO HERE ANYMORE\r
- }\r
- \r
-\r
- /**\r
* Creates a status notification to show the download progress\r
* \r
* @param download Download operation starting.\r
*/\r
private void notifyDownloadStart(DownloadFileOperation download) {\r
- /// create status notification to show the download progress\r
+ /// create status notification with a progress bar\r
mLastPercent = 0;\r
mNotification = new Notification(R.drawable.icon, getString(R.string.downloader_download_in_progress_ticker), System.currentTimeMillis());\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.setProgressBar(R.id.status_progress, 100, 0, download.getSize() < 0);\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
\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
+ mNotificationManager.notify(R.string.downloader_download_in_progress_ticker, mNotification);\r
}\r
\r
\r
/**\r
+ * Callback method to update the progress bar in the status notification.\r
+ */\r
+ @Override\r
+ public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {\r
+ int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer));\r
+ if (percent != mLastPercent) {\r
+ mNotification.contentView.setProgressBar(R.id.status_progress, 100, percent, totalToTransfer < 0);\r
+ String text = String.format(getString(R.string.downloader_download_in_progress_content), percent, fileName);\r
+ mNotification.contentView.setTextViewText(R.id.status_text, text);\r
+ mNotificationManager.notify(R.string.downloader_download_in_progress_ticker, mNotification);\r
+ }\r
+ mLastPercent = percent;\r
+ }\r
+ \r
+ \r
+ /**\r
+ * Callback method to update the progress bar in the status notification (old version)\r
+ */\r
+ @Override\r
+ public void onTransferProgress(long progressRate) {\r
+ // NOTHING TO DO HERE ANYMORE\r
+ }\r
+ \r
+\r
+ /**\r
* Updates the status notification with the result of a download operation.\r
* \r
* @param downloadResult Result of the download operation.\r
* @param download Finished download operation\r
*/\r
private void notifyDownloadResult(DownloadFileOperation download, RemoteOperationResult downloadResult) {\r
- mNotificationMngr.cancel(R.string.downloader_download_in_progress_ticker);\r
+ mNotificationManager.cancel(R.string.downloader_download_in_progress_ticker);\r
if (!downloadResult.isCancelled()) {\r
int tickerId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_ticker : R.string.downloader_download_failed_ticker;\r
int contentId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_content : R.string.downloader_download_failed_content;\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.getSavePath()).getName()), finalNotification.contentIntent);\r
- mNotificationMngr.notify(tickerId, finalNotification);\r
+ mNotificationManager.notify(tickerId, finalNotification);\r
}\r
}\r
\r
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.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 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;
private Looper mServiceLooper;
private ServiceHandler mServiceHandler;
+ private IBinder mBinder;
+ private WebdavClient mUploadClient = null;
+ private Account mLastAccount = null, mLastAccountWhereInstantFolderWasCreated = null;
+ private FileDataStorageManager mStorageManager;
- private AbstractList<Account> mAccounts = new Vector<Account>();
- private AbstractList<UploadFileOperation> mUploads = new Vector<UploadFileOperation>();
- private int mCurrentIndexUpload;
+ //private AbstractList<Account> mAccounts = new Vector<Account>();
+ //private AbstractList<UploadFileOperation> mUploads = new Vector<UploadFileOperation>();
+ //private int mCurrentIndexUpload;
+ private ConcurrentMap<String, UploadFileOperation> mPendingUploads = new ConcurrentHashMap<String, UploadFileOperation>();
+ private UploadFileOperation mCurrentUpload = null;
private NotificationManager mNotificationManager;
private Notification mNotification;
+ private int mLastPercent;
private RemoteViews mDefaultNotificationContentView;
- private long mTotalDataToSend, mSendData;
+ /*private long mTotalDataToSend, mSendData;
private int mTotalFilesToSend, mPreviousPercent;
- private int mSuccessCounter;
+ private int mSuccessCounter;*/
/**
- * Static map with the files being download and the path to the temporal file were are download
- */
- private static Map<String, String> mUploadsInProgress = Collections.synchronizedMap(new HashMap<String, String>());
-
- /**
- * 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();
}
-
- /**
- * Builds a key for mUplaodsInProgress from the accountName and remotePath
- */
- private static String buildRemoteName(String accountName, String remotePath) {
- return accountName + remotePath;
+
+ private String buildRemoteName(Account account, String remotePath) {
+ return account.name + remotePath;
}
* @return 'True' if the ownCloud server with version supports chunked uploads.
*/
private static boolean chunkedUploadIsSupported(OwnCloudVersion version) {
- return (version != null && version.compareTo(OwnCloudVersion.owncloud_v4_5) >= 0); // TODO uncomment when feature is full in server
- //return false;
+ return (version != null && version.compareTo(OwnCloudVersion.owncloud_v4_5) >= 0);
}
Process.THREAD_PRIORITY_BACKGROUND);
thread.start();
mServiceLooper = thread.getLooper();
- mServiceHandler = new ServiceHandler(mServiceLooper);
+ mServiceHandler = new ServiceHandler(mServiceLooper, this);
+ mBinder = new FileUploaderBinder();
}
*/
@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;
}
- Account account = intent.getParcelableExtra(KEY_ACCOUNT);
- if (account == null) {
- Log.e(TAG, "Bad account information provided in upload intent");
- return Service.START_NOT_STICKY;
- }
-
int uploadType = intent.getIntExtra(KEY_UPLOAD_TYPE, -1);
if (uploadType == -1) {
Log.e(TAG, "Incorrect upload type provided");
return Service.START_NOT_STICKY;
}
+ Account account = intent.getParcelableExtra(KEY_ACCOUNT);
+
String[] localPaths, remotePaths, mimeTypes;
if (uploadType == UPLOAD_SINGLE_FILE) {
localPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) };
remotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE);
mimeTypes = intent.getStringArrayExtra(KEY_MIME_TYPE);
}
-
+
+ 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;
boolean isInstant = intent.getBooleanExtra(KEY_INSTANT_UPLOAD, false);
boolean forceOverwrite = intent.getBooleanExtra(KEY_FORCE_OVERWRITE, false);
- for (int i=0; i < localPaths.length; i++) {
- OwnCloudVersion ocv = new OwnCloudVersion(AccountManager.get(this).getUserData(account, AccountAuthenticator.KEY_OC_VERSION));
- if (FileUploader.chunkedUploadIsSupported(ocv)) {
- mUploads.add(new ChunkedUploadFileOperation(localPaths[i], remotePaths[i], ((mimeTypes!=null)?mimeTypes[i]:""), isInstant, forceOverwrite, this));
- } else {
- mUploads.add(new UploadFileOperation(localPaths[i], remotePaths[i], (mimeTypes!=null?mimeTypes[i]:""), isInstant, forceOverwrite, this));
+ OwnCloudVersion ocv = new OwnCloudVersion(AccountManager.get(this).getUserData(account, AccountAuthenticator.KEY_OC_VERSION));
+ boolean chunked = FileUploader.chunkedUploadIsSupported(ocv);
+ AbstractList<String> requestedUploads = new Vector<String>();
+ 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);
}
- mAccounts.add(account);
+
+ } 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);
}
-
- Message msg = mServiceHandler.obtainMessage();
- msg.arg1 = startId;
- mServiceHandler.sendMessage(msg);
return Service.START_NOT_STICKY;
}
*/
@Override
public IBinder onBind(Intent arg0) {
- return null;
+ return mBinder;
}
+ /**
+ * 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 {
+
+ /**
+ * 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();
+ }
+ }
+
+
+ /**
+ * 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 final class ServiceHandler extends Handler {
- public ServiceHandler(Looper looper) {
+ 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;
}
@Override
public void handleMessage(Message msg) {
- uploadFile();
- stopSelf(msg.arg1);
+ @SuppressWarnings("unchecked")
+ AbstractList<String> requestedUploads = (AbstractList<String>) msg.obj;
+ if (msg.obj != null) {
+ Iterator<String> it = requestedUploads.iterator();
+ while (it.hasNext()) {
+ mService.uploadFile(it.next());
+ }
+ }
+ 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() {
+ public void uploadFile(String uploadKey) {
- /// prepare upload statistics
- mTotalDataToSend = mSendData = mPreviousPercent = 0;
- Iterator<UploadFileOperation> it = mUploads.iterator();
- while (it.hasNext()) {
- mTotalDataToSend += new File(it.next().getLocalPath()).length();
+ synchronized(mPendingUploads) {
+ mCurrentUpload = mPendingUploads.get(uploadKey);
}
- mTotalFilesToSend = mUploads.size();
- Log.d(TAG, "Will upload " + mTotalDataToSend + " bytes, with " + mUploads.size() + " files");
-
- notifyUploadStart();
-
- UploadFileOperation currentUpload;
- Account currentAccount, lastAccount = null;
- FileDataStorageManager storageManager = null;
- WebdavClient wc = null;
- mSuccessCounter = 0;
- boolean createdInstantDir = false;
+ if (mCurrentUpload != null) {
+
+ /// prepare upload statistics
+ /*mTotalDataToSend = mSendData = mPreviousPercent = 0;
+ Iterator<UploadFileOperation> 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");*/
+
- for (mCurrentIndexUpload = 0; mCurrentIndexUpload < mUploads.size(); mCurrentIndexUpload++) {
- currentUpload = mUploads.get(mCurrentIndexUpload);
- currentAccount = mAccounts.get(mCurrentIndexUpload);
+ notifyUploadStart(mCurrentUpload);
+
- /// prepare client object to send request(s) to the ownCloud server
- if (lastAccount == null || !lastAccount.equals(currentAccount)) {
- storageManager = new FileDataStorageManager(currentAccount, getContentResolver());
- wc = OwnCloudClientUtils.createOwnCloudClient(currentAccount, getApplicationContext());
- wc.setDataTransferProgressListener(this);
+ /// 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());
}
- if (currentUpload.isInstant() && !createdInstantDir) {
- createdInstantDir = createRemoteFolderForInstantUploads(wc, storageManager);
+ /// 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
- long parentDirId = -1;
RemoteOperationResult uploadResult = null;
- boolean updateResult = false;
+ long parentDirId = -1;
try {
- File remote = new File(currentUpload.getRemotePath());
- parentDirId = storageManager.getFileByPath(remote.getParent().endsWith("/")?remote.getParent():remote.getParent()+"/").getFileId();
- File local = new File(currentUpload.getLocalPath());
+ 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();
- mUploadsInProgress.put(buildRemoteName(currentAccount.name, currentUpload.getRemotePath()), currentUpload.getLocalPath());
- uploadResult = currentUpload.execute(wc);
+ uploadResult = mCurrentUpload.execute(mUploadClient);
if (uploadResult.isSuccess()) {
- saveNewOCFile(currentUpload, storageManager, parentDirId, size);
- mSuccessCounter++;
- updateResult = true;
+ saveNewOCFile(mCurrentUpload, mStorageManager, parentDirId, size);
}
} finally {
- mUploadsInProgress.remove(buildRemoteName(currentAccount.name, currentUpload.getRemotePath()));
- broadcastUploadEnd(currentUpload, currentAccount, updateResult, parentDirId);
+ synchronized(mPendingUploads) {
+ mPendingUploads.remove(uploadKey);
+ }
}
- }
- notifyUploadEndOverview();
+ /// notify result
+ notifyUploadResult(uploadResult, mCurrentUpload);
+
+ sendFinalBroadcast(mCurrentUpload, uploadResult, parentDirId);
+
+ }
}
/**
* Creates a status notification to show the upload progress
+ *
+ * @param upload Upload operation starting.
*/
- private void notifyUploadStart() {
+ 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);
- // 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);
+
+ /// 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);
+ */
+
mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification);
}
/**
- * Notifies upload (or fail) of a file to activities interested
+ * Callback method to update the progress bar in the status notification
*/
- private void broadcastUploadEnd(UploadFileOperation upload, Account account, boolean success, 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, account.name);
- end.putExtra(EXTRA_UPLOAD_RESULT, success);
- end.putExtra(EXTRA_PARENT_DIR_ID, parentDirId);
- sendBroadcast(end);
+ @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 results of a batch of uploads.
+ * 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 notifyUploadEndOverview() {
- /// notify final result
- if (mSuccessCounter == mTotalFilesToSend) { // success
+ 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 = mDefaultNotificationContentView;
- // TODO put something smart in the contentIntent below
- mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
- if (mTotalFilesToSend == 1) {
- mNotification.setLatestEventInfo( getApplicationContext(),
- getString(R.string.uploader_upload_succeeded_ticker),
- String.format(getString(R.string.uploader_upload_succeeded_content_single), (new File(mUploads.get(0).getLocalPath())).getName()),
- mNotification.contentIntent);
- } else {
- mNotification.setLatestEventInfo( getApplicationContext(),
+
+ /// 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 (mTotalFilesToSend == 1) {
- finalNotification.setLatestEventInfo( getApplicationContext(),
- getString(R.string.uploader_upload_failed_ticker),
- String.format(getString(R.string.uploader_upload_failed_content_single), (new File(mUploads.get(0).getLocalPath())).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, mTotalFilesToSend),
finalNotification.contentIntent);
- }
- mNotificationManager.notify(R.string.uploader_upload_failed_ticker, finalNotification);
+ } */
}
}
/**
- * 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 onTransferProgress(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(mUploads.get(mCurrentIndexUpload).getLocalPath()).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);
}
- @Override
- public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {
- // TODO Maybe replace the other transferProgress with this
- }
-
-
+
}
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.PutMethod;
+import android.accounts.Account;
import android.util.Log;
import eu.alefzero.webdav.ChunkFromFileChannelRequestEntity;
-import eu.alefzero.webdav.OnDatatransferProgressListener;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;
private static final String OC_CHUNKED_HEADER = "OC-Chunked";
private static final String TAG = ChunkedUploadFileOperation.class.getSimpleName();
- public ChunkedUploadFileOperation( String localPath,
+ public ChunkedUploadFileOperation( Account account,
+ String localPath,
String remotePath,
String mimeType,
boolean isInstant,
- boolean forceOverwrite,
- OnDatatransferProgressListener dataTransferProgressListener) {
+ boolean forceOverwrite) {
- super(localPath, remotePath, mimeType, isInstant, forceOverwrite, dataTransferProgressListener);
+ super(account, localPath, remotePath, mimeType, isInstant, forceOverwrite);
}
@Override
channel = raf.getChannel();
lock = channel.tryLock();
ChunkFromFileChannelRequestEntity entity = new ChunkFromFileChannelRequestEntity(channel, getMimeType(), CHUNK_SIZE);
- entity.setOnDatatransferProgressListener(getDataTransferListener());
+ entity.addOnDatatransferProgressListeners(getDataTransferListeners());
long offset = 0;
String uriPrefix = client.getBaseUri() + WebdavUtils.encodePath(getRemotePath()) + "-chunking-" + Math.abs((new Random()).nextInt(9000)+1000) + "-" ;
long chunkCount = (long) Math.ceil((double)file.length() / CHUNK_SIZE);
private Account mAccount = null;
private OCFile mFile;
- private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
-
private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
+ private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
public DownloadFileOperation(Account account, OCFile file) {
import java.io.File;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.PutMethod;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;
+import android.accounts.Account;
import android.util.Log;
import android.webkit.MimeTypeMap;
private static final String TAG = UploadFileOperation.class.getCanonicalName();
+ private Account mAccount = null;
private String mLocalPath = null;
private String mRemotePath = null;
private String mMimeType = null;
private boolean mIsInstant = false;
private boolean mForceOverwrite = false;
- private OnDatatransferProgressListener mDataTransferListener = null;
+ private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
+ public UploadFileOperation( Account account,
+ String localPath,
+ String remotePath,
+ String mimeType,
+ boolean isInstant,
+ boolean forceOverwrite) {
+ if (account == null)
+ throw new IllegalArgumentException("Illegal null account in UploadFileOperation creation");
+ if (localPath == null || localPath.length() <= 0)
+ throw new IllegalArgumentException("Illegal null or empty localPath in UploadFileOperation creation");
+ if (remotePath == null || remotePath.length() <= 0)
+ throw new IllegalArgumentException("Illegal null or empty remotePath in UploadFileOperation creation");
+
+ mAccount = account;
+ mLocalPath = localPath;
+ mRemotePath = remotePath;
+ mMimeType = mimeType;
+ if (mMimeType == null || mMimeType.length() <= 0) {
+ try {
+ mMimeType = MimeTypeMap.getSingleton()
+ .getMimeTypeFromExtension(
+ localPath.substring(localPath.lastIndexOf('.') + 1));
+ } catch (IndexOutOfBoundsException e) {
+ Log.e(TAG, "Trying to find out MIME type of a file without extension: " + localPath);
+ }
+ }
+ if (mMimeType == null) {
+ mMimeType = "application/octet-stream";
+ }
+ mIsInstant = isInstant;
+ mForceOverwrite = forceOverwrite;
+ }
+
+
+ public Account getAccount() {
+ return mAccount;
+ }
+
public String getLocalPath() {
return mLocalPath;
}
public String getMimeType() {
return mMimeType;
}
-
public boolean isInstant() {
return mIsInstant;
}
-
public boolean getForceOverwrite() {
return mForceOverwrite;
}
- public OnDatatransferProgressListener getDataTransferListener() {
- return mDataTransferListener ;
+ public Set<OnDatatransferProgressListener> getDataTransferListeners() {
+ return mDataTransferListeners;
}
-
- public UploadFileOperation( String localPath,
- String remotePath,
- String mimeType,
- boolean isInstant,
- boolean forceOverwrite,
- OnDatatransferProgressListener dataTransferProgressListener) {
- mLocalPath = localPath;
- mRemotePath = remotePath;
- mMimeType = mimeType;
- if (mMimeType == null) {
- try {
- mMimeType = MimeTypeMap.getSingleton()
- .getMimeTypeFromExtension(
- localPath.substring(localPath.lastIndexOf('.') + 1));
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Trying to find out MIME type of a file without extension: " + localPath);
- }
- }
- if (mMimeType == null) {
- mMimeType = "application/octet-stream";
- }
- mIsInstant = isInstant;
- mForceOverwrite = forceOverwrite;
- mDataTransferListener = dataTransferProgressListener;
+ public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
+ mDataTransferListeners.add(listener);
}
+
@Override
protected RemoteOperationResult run(WebdavClient client) {
RemoteOperationResult result = null;
try {
File f = new File(mLocalPath);
FileRequestEntity entity = new FileRequestEntity(f, mMimeType);
- entity.addOnDatatransferProgressListener(mDataTransferListener);
+ entity.addOnDatatransferProgressListeners(mDataTransferListeners);
put.setRequestEntity(entity);
status = client.executeMethod(put);
client.exhaustResponse(put.getResponseBodyAsStream());
}
}
+
}
import android.os.Bundle;\r
import android.os.IBinder;\r
import android.support.v4.app.FragmentTransaction;\r
+import android.util.Log;\r
\r
import com.actionbarsherlock.app.ActionBar;\r
import com.actionbarsherlock.app.SherlockFragmentActivity;\r
import com.owncloud.android.datamodel.OCFile;\r
import com.owncloud.android.files.services.FileDownloader;\r
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
+import com.owncloud.android.files.services.FileUploader;\r
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
import com.owncloud.android.ui.fragment.FileDetailFragment;\r
\r
import com.owncloud.android.R;\r
public class FileDetailActivity extends SherlockFragmentActivity implements FileDetailFragment.ContainerActivity {\r
\r
public static final int DIALOG_SHORT_WAIT = 0;\r
+\r
+ public static final String TAG = FileDetailActivity.class.getSimpleName();\r
\r
private boolean mConfigurationChangedToLandscape = false;\r
private FileDownloaderBinder mDownloaderBinder = null;\r
- private ServiceConnection mConnection = null;\r
+ private ServiceConnection mDownloadConnection, mUploadConnection = null;\r
+ private FileUploaderBinder mUploaderBinder = null;\r
+\r
\r
@Override\r
protected void onCreate(Bundle savedInstanceState) {\r
);\r
\r
if (!mConfigurationChangedToLandscape) {\r
- mConnection = new DetailsServiceConnection();\r
- bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);\r
+ mDownloadConnection = new DetailsServiceConnection();\r
+ bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);\r
+ mUploadConnection = new DetailsServiceConnection();\r
+ bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);\r
\r
setContentView(R.layout.file_activity_details);\r
\r
private class DetailsServiceConnection implements ServiceConnection {\r
\r
@Override\r
- public void onServiceConnected(ComponentName className, IBinder service) {\r
- mDownloaderBinder = (FileDownloaderBinder) service;\r
+ public void onServiceConnected(ComponentName component, IBinder service) {\r
+ if (component.equals(new ComponentName(FileDetailActivity.this, FileDownloader.class))) {\r
+ Log.d(TAG, "Download service connected");\r
+ mDownloaderBinder = (FileDownloaderBinder) service;\r
+ } else if (component.equals(new ComponentName(FileDetailActivity.this, FileUploader.class))) {\r
+ Log.d(TAG, "Upload service connected");\r
+ mUploaderBinder = (FileUploaderBinder) service;\r
+ } else {\r
+ return;\r
+ }\r
FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
if (fragment != null)\r
fragment.updateFileDetails(); // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais())\r
}\r
\r
@Override\r
- public void onServiceDisconnected(ComponentName arg0) {\r
- mDownloaderBinder = null;\r
+ public void onServiceDisconnected(ComponentName component) {\r
+ if (component.equals(new ComponentName(FileDetailActivity.this, FileDownloader.class))) {\r
+ Log.d(TAG, "Download service disconnected");\r
+ mDownloaderBinder = null;\r
+ } else if (component.equals(new ComponentName(FileDetailActivity.this, FileUploader.class))) {\r
+ Log.d(TAG, "Upload service disconnected");\r
+ mUploaderBinder = null;\r
+ }\r
}\r
}; \r
\r
@Override\r
public void onDestroy() {\r
super.onDestroy();\r
- if (mConnection != null) {\r
- unbindService(mConnection);\r
- mConnection = null;\r
+ if (mDownloadConnection != null) {\r
+ unbindService(mDownloadConnection);\r
+ mDownloadConnection = null;\r
+ }\r
+ if (mUploadConnection != null) {\r
+ unbindService(mUploadConnection);\r
+ mUploadConnection = null;\r
}\r
}\r
\r
public FileDownloaderBinder getFileDownloaderBinder() {\r
return mDownloaderBinder;\r
}\r
+\r
+\r
+ @Override\r
+ public FileUploaderBinder getFileUploaderBinder() {\r
+ return mUploaderBinder;\r
+ }\r
\r
}\r
import com.owncloud.android.files.services.FileDownloader;\r
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
import com.owncloud.android.files.services.FileUploader;\r
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
import com.owncloud.android.network.OwnCloudClientUtils;\r
import com.owncloud.android.syncadapter.FileSyncService;\r
import com.owncloud.android.ui.fragment.FileDetailFragment;\r
private UploadFinishReceiver mUploadFinishReceiver;\r
private DownloadFinishReceiver mDownloadFinishReceiver;\r
private FileDownloaderBinder mDownloaderBinder = null;\r
+ private FileUploaderBinder mUploaderBinder = null;\r
+ private ServiceConnection mDownloadConnection = null, mUploadConnection = null;\r
\r
private OCFileListFragment mFileList;\r
\r
\r
}\r
\r
- bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);\r
+ mUploadConnection = new ListServiceConnection(); \r
+ mDownloadConnection = new ListServiceConnection();\r
+ bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);\r
+ bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);\r
\r
// PIN CODE request ; best location is to decide, let's try this first\r
if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
@Override\r
public void onDestroy() {\r
super.onDestroy();\r
- unbindService(mConnection);\r
+ if (mDownloadConnection != null)\r
+ unbindService(mDownloadConnection);\r
+ if (mUploadConnection != null)\r
+ unbindService(mUploadConnection);\r
}\r
\r
\r
public FileDownloaderBinder getFileDownloaderBinder() {\r
return mDownloaderBinder;\r
}\r
+\r
+ \r
+ /**\r
+ * {@inheritDoc}\r
+ */\r
+ @Override\r
+ public FileUploaderBinder getFileUploaderBinder() {\r
+ return mUploaderBinder;\r
+ }\r
\r
\r
/** Defines callbacks for service binding, passed to bindService() */\r
- private ServiceConnection mConnection = new ServiceConnection() {\r
+ private class ListServiceConnection implements ServiceConnection {\r
\r
@Override\r
- public void onServiceConnected(ComponentName className, IBinder service) {\r
- mDownloaderBinder = (FileDownloaderBinder) service;\r
- // a new chance to get the mDownloadBinder through getDownloadBinder() - THIS IS A MESS\r
+ public void onServiceConnected(ComponentName component, IBinder service) {\r
+ if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
+ Log.d(TAG, "Download service connected");\r
+ mDownloaderBinder = (FileDownloaderBinder) service;\r
+ } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
+ Log.d(TAG, "Upload service connected");\r
+ mUploaderBinder = (FileUploaderBinder) service;\r
+ } else {\r
+ return;\r
+ }\r
+ // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS\r
mFileList.listDirectory();\r
if (mDualPane) {\r
FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
}\r
\r
@Override\r
- public void onServiceDisconnected(ComponentName arg0) {\r
- mDownloaderBinder = null;\r
+ public void onServiceDisconnected(ComponentName component) {\r
+ if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
+ Log.d(TAG, "Download service disconnected");\r
+ mDownloaderBinder = null;\r
+ } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
+ Log.d(TAG, "Upload service disconnected");\r
+ mUploaderBinder = null;\r
+ }\r
}\r
}; \r
\r
package com.owncloud.android.ui.activity;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
public interface TransferServiceGetter {
*/
public FileDownloaderBinder getFileDownloaderBinder();
+
+ /**
+ * Callback method invoked when the parent activity is fully created to get a reference to the FileUploader service API.
+ *
+ * @return Directory to list firstly. Can be NULL.
+ */
+ public FileUploaderBinder getFileUploaderBinder();
+
}
import com.owncloud.android.datamodel.DataStorageManager;\r
import com.owncloud.android.datamodel.OCFile;\r
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
-import com.owncloud.android.files.services.FileUploader;\r
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
import com.owncloud.android.ui.activity.TransferServiceGetter;\r
\r
import com.owncloud.android.R;\r
ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
//if (FileDownloader.isDownloading(mAccount, file.getRemotePath())) {\r
FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
+ FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();\r
if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {\r
localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
localStateView.setVisibility(View.VISIBLE);\r
- } else if (FileUploader.isUploading(mAccount, file.getRemotePath())) {\r
+ } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {\r
localStateView.setImageResource(R.drawable.uploading_file_indicator);\r
localStateView.setVisibility(View.VISIBLE);\r
} else if (file.isDown()) {\r
import com.owncloud.android.files.services.FileDownloader;\r
import com.owncloud.android.files.services.FileUploader;\r
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
import com.owncloud.android.network.OwnCloudClientUtils;\r
import com.owncloud.android.ui.activity.FileDetailActivity;\r
import com.owncloud.android.ui.activity.FileDisplayActivity;\r
// configure UI for depending upon local state of the file\r
//if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r
- if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
+ FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();\r
+ if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) || (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile))) {\r
setButtonsForTransferring();\r
\r
} else if (mFile.isDown()) {\r
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
import org.apache.commons.httpclient.methods.RequestEntity;
private final String mContentType;
private final long mSize;
private long mOffset;
- private OnDatatransferProgressListener mListener;
+ Set<OnDatatransferProgressListener> mListeners = new HashSet<OnDatatransferProgressListener>();
private ByteBuffer mBuffer = ByteBuffer.allocate(4096);
public ChunkFromFileChannelRequestEntity(final FileChannel channel, final String contentType, long size) {
return true;
}
- public void setOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
- mListener = listener;
+ public void addOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
+ mListeners.add(listener);
}
+ public void addOnDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
+ mListeners.addAll(listeners);
+ }
+
+ public void removeOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
+ mListeners.remove(listener);
+ }
+
+
public void writeRequest(final OutputStream out) throws IOException {
int readCount = 0;
+ Iterator<OnDatatransferProgressListener> it = null;
try {
mChannel.position(mOffset);
readCount = mChannel.read(mBuffer);
out.write(mBuffer.array(), 0, readCount);
mBuffer.clear();
- if (mListener != null)
- mListener.onTransferProgress(readCount);
+ it = mListeners.iterator();
+ while (it.hasNext()) {
+ it.next().onTransferProgress(readCount);
+ }
}
} catch (IOException io) {
projects / pub / Android / ownCloud.git / commitdiff