Removed dependency of OCUpload on OCFile

src/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -31,7 +31,6 @@ import com.owncloud.android.db.UploadResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.operations.UploadFileOperation;
-import com.owncloud.android.utils.FileStorageUtils;
 
 import java.io.File;
 import java.util.Observable;
@@ -126,12 +125,12 @@ public class UploadsStorageManager extends Observable {
         Log_OC.e(TAG, "Inserting " + ocUpload.getLocalPath() + " with status=" + ocUpload.getUploadStatus());
 
         ContentValues cv = new ContentValues();
-        cv.put(ProviderTableMeta.UPLOADS_PATH, ocUpload.getLocalPath());
-        cv.put(ProviderTableMeta.UPLOADS_STATUS, ocUpload.getUploadStatus().value);
-        cv.put(ProviderTableMeta.UPLOADS_FILE_ID, ocUpload.getOCFile().getFileId());
+        cv.put(ProviderTableMeta.UPLOADS_LOCAL_PATH, ocUpload.getLocalPath());
+        cv.put(ProviderTableMeta.UPLOADS_REMOTE_PATH, ocUpload.getRemotePath());
         cv.put(ProviderTableMeta.UPLOADS_ACCOUNT_NAME, ocUpload.getAccountName());
+        cv.put(ProviderTableMeta.UPLOADS_STATUS, ocUpload.getUploadStatus().value);
+        //cv.put(ProviderTableMeta.UPLOADS_FILE_ID, ocUpload.getOCFile().getFileId());
         cv.put(ProviderTableMeta.UPLOADS_LOCAL_BEHAVIOUR, ocUpload.getLocalAction());
-        //cv.put(ProviderTableMeta.UPLOADS_UPLOAD_TIME, ocUpload.getUploadTime());
         cv.put(ProviderTableMeta.UPLOADS_FORCE_OVERWRITE, ocUpload.isForceOverwrite() ? 1 : 0);
         cv.put(ProviderTableMeta.UPLOADS_IS_WHILE_CHARGING_ONLY, ocUpload.isWhileChargingOnly() ? 1 : 0);
         cv.put(ProviderTableMeta.UPLOADS_IS_WIFI_ONLY, ocUpload.isUseWifiOnly() ? 1 : 0);
@@ -161,7 +160,10 @@ public class UploadsStorageManager extends Observable {
         Log_OC.e(TAG, "Updating " + ocUpload.getLocalPath() + " with status=" + ocUpload.getUploadStatus());
 
         ContentValues cv = new ContentValues();
-        cv.put(ProviderTableMeta.UPLOADS_PATH, ocUpload.getLocalPath());
+        /*  TODO - check what is really needed to update
+        cv.put(ProviderTableMeta.UPLOADS_LOCAL_PATH, ocUpload.getLocalPath());
+        cv.put(ProviderTableMeta.UPLOADS_REMOTE_PATH, ocUpload.getRemotePath());
+        cv.put(ProviderTableMeta.UPLOADS_ACCOUNT_NAME, ocUpload.getAccountName());*/
         cv.put(ProviderTableMeta.UPLOADS_STATUS, ocUpload.getUploadStatus().value);
         cv.put(ProviderTableMeta.UPLOADS_LAST_RESULT, ocUpload.getLastResult().getValue());
 
@@ -198,7 +200,7 @@ public class UploadsStorageManager extends Observable {
             // read upload object and update
             OCUpload upload = createOCUploadFromCursor(c);
 
-            String path = c.getString(c.getColumnIndex(ProviderTableMeta.UPLOADS_PATH));
+            String path = c.getString(c.getColumnIndex(ProviderTableMeta.UPLOADS_LOCAL_PATH));
             Log_OC.v(
                     TAG,
                     "Updating " + path + " with status:" + status + " and result:"
@@ -245,7 +247,7 @@ public class UploadsStorageManager extends Observable {
         return updateUploadInternal(c, status, result);
     }
 
-
+    /*
     public int updateFileIdUpload(long uploadId, long fileId) {
         Log_OC.e(TAG, "Updating " + uploadId + " with fileId= " + fileId);
 
@@ -267,6 +269,7 @@ public class UploadsStorageManager extends Observable {
 
         return result;
     }
+    */
 
     /**
      * Should be called when some value of this DB was changed. All observers
@@ -288,7 +291,7 @@ public class UploadsStorageManager extends Observable {
     public int removeUpload(String localPath) {
         int result = getDB().delete(
                 ProviderTableMeta.CONTENT_URI_UPLOADS,
-                ProviderTableMeta.UPLOADS_PATH + "=?",
+                ProviderTableMeta.UPLOADS_LOCAL_PATH + "=?",
                 new String[]{localPath}
         );
         Log_OC.d(TAG, "delete returns with: " + result + " for file: " + localPath);
@@ -323,7 +326,7 @@ public class UploadsStorageManager extends Observable {
     }
 
     public OCUpload[] getUploadByLocalPath(String localPath) {
-        return getUploads(ProviderTableMeta.UPLOADS_PATH + "=?", new String[]{localPath});
+        return getUploads(ProviderTableMeta.UPLOADS_LOCAL_PATH + "=?", new String[]{localPath});
     }
 
 
@@ -338,12 +341,10 @@ public class UploadsStorageManager extends Observable {
         OCUpload[] list = new OCUpload[c.getCount()];
         if (c.moveToFirst()) {
             do {
-                long fileUploadId = c.getLong(c.getColumnIndex(ProviderTableMeta.UPLOADS_FILE_ID));
-//                // getFile for this fileUploadId
-//                OCFile file = getUploadFile(fileUploadId);
+                //long fileUploadId = c.getLong(c.getColumnIndex(ProviderTableMeta.UPLOADS_FILE_ID));
                 OCUpload upload = createOCUploadFromCursor(c);
                 if (upload == null) {
-                    Log_OC.e(TAG, "Upload for file id = " + fileUploadId + "not found on DB");
+                    Log_OC.e(TAG, "OCUpload could not be created from cursor");
                 } else {
                     list[c.getPosition()] = upload;
                 }
@@ -355,6 +356,7 @@ public class UploadsStorageManager extends Observable {
         return list;
     }
 
+    /*
     private OCFile getUploadFile(long id) {
         OCFile file = null;
         Cursor c = getDB().query(
@@ -372,7 +374,9 @@ public class UploadsStorageManager extends Observable {
 
         return file;
     }
+    */
 
+    /*
     private OCFile createFileInstance(Cursor c) {
         OCFile file = null;
         if (c != null) {
@@ -430,19 +434,20 @@ public class UploadsStorageManager extends Observable {
         }
         return file;
     }
+    */
 
     private OCUpload createOCUploadFromCursor(Cursor c) {
         OCUpload upload = null;
         if (c != null) {
-            long fileUploadId = c.getLong(c.getColumnIndex(ProviderTableMeta.UPLOADS_FILE_ID));
-            //String uploadObjectString = c.getString(c.getColumnIndex("uploadObject"));
-            // getFile for this fileUploadId
-            OCFile file = getUploadFile(fileUploadId);
-            upload = new OCUpload(file);
+            String localPath = c.getString(c.getColumnIndex(ProviderTableMeta.UPLOADS_LOCAL_PATH));
+            String remotePath = c.getString(c.getColumnIndex(ProviderTableMeta.UPLOADS_REMOTE_PATH));
+            String accountName = c.getString(c.getColumnIndex(ProviderTableMeta.UPLOADS_ACCOUNT_NAME));
+            upload = new OCUpload(localPath, remotePath, accountName);
+
             upload.setUploadId(c.getLong(c.getColumnIndex(ProviderTableMeta._ID)));
-            upload.setUploadStatus(UploadStatus.fromValue(c.getInt(c.getColumnIndex(ProviderTableMeta.UPLOADS_STATUS)
-            )));
-            upload.setAccountName(c.getString(c.getColumnIndex(ProviderTableMeta.UPLOADS_ACCOUNT_NAME)));
+            upload.setUploadStatus(
+                    UploadStatus.fromValue(c.getInt(c.getColumnIndex(ProviderTableMeta.UPLOADS_STATUS)))
+            );
             upload.setLocalAction(c.getInt(c.getColumnIndex((ProviderTableMeta.UPLOADS_LOCAL_BEHAVIOUR))));
             upload.setForceOverwrite(c.getInt(
                     c.getColumnIndex(ProviderTableMeta.UPLOADS_FORCE_OVERWRITE)) == 1);
@@ -452,7 +457,6 @@ public class UploadsStorageManager extends Observable {
                     c.getColumnIndex(ProviderTableMeta.UPLOADS_IS_WHILE_CHARGING_ONLY)) == 1);
             upload.setUseWifiOnly(c.getInt(
                     c.getColumnIndex(ProviderTableMeta.UPLOADS_IS_WIFI_ONLY)) == 1);
-            upload.setUploadTimestamp(c.getLong(c.getColumnIndex(ProviderTableMeta.UPLOADS_UPLOAD_TIMESTAMP)));
             upload.setLastResult(UploadResult.fromValue(
                     c.getInt(c.getColumnIndex(ProviderTableMeta.UPLOADS_LAST_RESULT))));
         }

src/com/owncloud/android/db/OCUpload.java

@@ -2,6 +2,8 @@
  *   ownCloud Android client application
  *
  *   @author LukeOwncloud
+ *   @author masensio
+ *   @author David A. Velasco
  *   Copyright (C) 2015 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -32,20 +34,18 @@ import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.MimetypeIconUtil;
 import com.owncloud.android.utils.UploadUtils;
 
 import java.io.File;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 /**
  * Stores all information in order to start upload operations. PersistentUploadObject can
  * be stored persistently by {@link UploadsStorageManager}.
  * 
  */
-public class OCUpload implements Parcelable{
+public class OCUpload implements Parcelable {
 
     /** Generated - should be refreshed every time the class changes!! */
 //    private static final long serialVersionUID = 2647551318657321611L;
@@ -54,15 +54,27 @@ public class OCUpload implements Parcelable{
 
     private long mId;
 
-    private OCFile mFile;
+    //private OCFile mFile;
     /**
-     * Local action for upload. (0 - COPY, 1 - MOVE, 2 - FORGET)
+     * Absolute path in the local file system to the file to be uploaded
      */
-    private int mLocalAction;
+    private String mLocalPath;
+
+    /**
+     * Absolute path in the remote account to set to the uploaded file (not for its parent folder!)
+     */
+    private String mRemotePath;
+
+    /**
+     * Name of Owncloud account to upload file to.
+     */
+    private String mAccountName;
+
     /**
-     * Date and time when this upload was first requested.
+     * Local action for upload. (0 - COPY, 1 - MOVE, 2 - FORGET)
      */
-    private Calendar mUploadTime = new GregorianCalendar();  //TODO needed??
+    private int mLocalAction;
+
     /**
      * Overwrite destination file?
      */
@@ -79,14 +91,6 @@ public class OCUpload implements Parcelable{
      * Upload only if phone being charged?
      */
     private boolean mIsWhileChargingOnly;
-    /**
-     * Earliest time when upload may be started. Negative if not set.
-     */
-    private long mUploadTimestamp;
-    /**
-     * Name of Owncloud account to upload file to.
-     */
-    private String mAccountName;
     /**
      * Status of upload (later, in_progress, ...).
      */
@@ -96,24 +100,55 @@ public class OCUpload implements Parcelable{
      */
     private UploadResult mLastResult;
 
-    // Constructor
-    public OCUpload(OCFile ocFile) {
-        this.mFile = ocFile;
-        resetData();     // TODO needed???
 
+    /**
+     * Main constructor
+     *
+     * @param localPath         Absolute path in the local file system to the file to be uploaded.
+     * @param remotePath        Absolute path in the remote account to set to the uploaded file.
+     * @param accountName       Name of an ownCloud account to update the file to.
+     */
+    public OCUpload(String localPath, String remotePath, String accountName) {
+        if (localPath == null || !localPath.startsWith(File.separator)) {
+            throw new IllegalArgumentException("Local path must be an absolute path in the local file system");
+        }
+        if (remotePath == null || !remotePath.startsWith(OCFile.PATH_SEPARATOR)) {
+            throw new IllegalArgumentException("Remote path must be an absolute path in the local file system");
+        }
+        if (accountName == null || accountName.length() < 1) {
+            throw new IllegalArgumentException("Invalid account name");
+        }
+        resetData();
+        mLocalPath = localPath;
+        mRemotePath = remotePath;
+        mAccountName = accountName;
+    }
+
+
+    /**
+     * Convenience constructor to reupload already existing {@link OCFile}s
+     *
+     * @param  ocFile           {@link OCFile} instance to update in the remote server.
+     * @param  account          ownCloud {@link Account} where ocFile is contained.
+     */
+    public OCUpload(OCFile ocFile, Account account) {
+        this(ocFile.getStoragePath(), ocFile.getRemotePath(), account.name);
     }
 
-    // TODO needed???
-    private void resetData(){
+
+    /**
+     * Reset all the fields to default values.
+     */
+    private void resetData() {
+        mRemotePath = "";
+        mLocalPath = "";
+        mAccountName = "";
         mId = -1;
         mLocalAction = FileUploader.LOCAL_BEHAVIOUR_COPY;
-        mUploadTime = new GregorianCalendar();
         mForceOverwrite = false;
         mIsCreateRemoteFolder = false;
         mIsUseWifiOnly = true;
         mIsWhileChargingOnly = false;
-        mUploadTimestamp = -1;
-        mAccountName = "";
         mUploadStatus = UploadStatus.UPLOAD_LATER;
         mLastResult = UploadResult.UNKNOWN;
     }
@@ -126,14 +161,6 @@ public class OCUpload implements Parcelable{
         return mId;
     }
 
-    public OCFile getOCFile() {
-        return mFile;
-    }
-
-    public Calendar getUploadTime() {
-        return mUploadTime;
-    }
-
     /**
      * @return the uploadStatus
      */
@@ -169,21 +196,25 @@ public class OCUpload implements Parcelable{
      * @return the localPath
      */
     public String getLocalPath() {
-        return mFile.getStoragePath();
+        return mLocalPath;
+    }
+
+    public void setLocalPath(String localPath) {
+        mLocalPath = localPath;
     }
 
     /**
      * @return the remotePath
      */
     public String getRemotePath() {
-        return mFile.getRemotePath();
+        return mRemotePath;
     }
 
     /**
      * @return the mimeType
      */
     public String getMimeType() {
-        return mFile.getMimetype();
+        return MimetypeIconUtil.getBestMimeTypeByFilename(mLocalPath);
     }
 
     /**
@@ -249,13 +280,6 @@ public class OCUpload implements Parcelable{
         return mAccountName;
     }
 
-    /**
-     * @param accountName the accountName to set
-     */
-    public void setAccountName(String accountName) {
-        this.mAccountName = accountName;
-    }
-
     /**
      * Returns owncloud account as {@link Account} object.  
      */
@@ -271,22 +295,6 @@ public class OCUpload implements Parcelable{
         return mIsWhileChargingOnly;
     }
 
-    /**
-     * Earliest time when upload may be started. Negative if not set.
-     * @return the uploadTimestamp
-     */
-    public long getUploadTimestamp() {
-        return mUploadTimestamp;
-    }
-
-    /**
-     * Earliest time when upload may be started. Set to negative value for immediate upload.
-     * @param uploadTimestamp the uploadTimestamp to set
-     */
-    public void setUploadTimestamp(long uploadTimestamp) {
-        this.mUploadTimestamp = uploadTimestamp;
-    }
-    
     /**
      * For debugging purposes only.
      */
@@ -307,7 +315,7 @@ public class OCUpload implements Parcelable{
     public void removeAllUploadRestrictions() {
         setUseWifiOnly(false);
         setWhileChargingOnly(false);
-        setUploadTimestamp(0);
+        //setUploadTimestamp(0);
     }
 
     /**
@@ -369,14 +377,14 @@ public class OCUpload implements Parcelable{
 
     public void readFromParcel(Parcel source) {
         mId = source.readLong();
-        mFile = source.readParcelable(OCFile.class.getClassLoader());
-        mLocalAction = source.readInt();
-        mForceOverwrite = source.readInt() == 0;
-        mIsCreateRemoteFolder = source.readInt() == 0;
-        mIsUseWifiOnly = source.readInt() == 0;
-        mIsWhileChargingOnly = source.readInt() == 0;
-        mUploadTimestamp = source.readLong();
+        mLocalPath = source.readString();
+        mRemotePath = source.readString();
         mAccountName = source.readString();
+        mLocalAction = source.readInt();
+        mForceOverwrite = (source.readInt() == 1);
+        mIsCreateRemoteFolder = (source.readInt() == 1);
+        mIsUseWifiOnly = (source.readInt() == 1);
+        mIsWhileChargingOnly = (source.readInt() == 1);
         try {
             mUploadStatus = UploadStatus.valueOf(source.readString());
         } catch (IllegalArgumentException x) {
@@ -398,15 +406,14 @@ public class OCUpload implements Parcelable{
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(mId);
-        dest.writeParcelable(mFile, flags);
+        dest.writeString(mLocalPath);
+        dest.writeString(mRemotePath);
+        dest.writeString(mAccountName);
         dest.writeInt(mLocalAction);
-        //dest.writeLong(mUploadTime);
         dest.writeInt(mForceOverwrite ? 1 : 0);
         dest.writeInt(mIsCreateRemoteFolder ? 1 : 0);
         dest.writeInt(mIsUseWifiOnly ? 1 : 0);
         dest.writeInt(mIsWhileChargingOnly ? 1 : 0);
-        dest.writeLong(mUploadTimestamp);
-        dest.writeString(mAccountName);
         dest.writeString(mUploadStatus.name());
         dest.writeString(((mLastResult == null) ? "" : mLastResult.name()));
     }
@@ -447,15 +454,6 @@ public class OCUpload implements Parcelable{
             Log_OC.d(TAG, "Do not start upload because it is while charging only.");
             return CanUploadFileNowStatus.LATER;
         }
-        Date now = new Date();
-        if (now.getTime() < getUploadTimestamp()) {
-            Log_OC.d(
-                    TAG,
-                    "Do not start upload because it is schedule for "
-                            + DisplayUtils.unixTimeToHumanReadable(getUploadTimestamp()));
-            return CanUploadFileNowStatus.LATER;
-        }
-
 
         if (!new File(getLocalPath()).exists()) {
             Log_OC.d(TAG, "Do not start upload because local file does not exist.");
@@ -472,10 +470,6 @@ public class OCUpload implements Parcelable{
     public String getUploadLaterReason(Context context) {
         StringBuilder reason = new StringBuilder();
         Date now = new Date();
-        if (now.getTime() < getUploadTimestamp()) {
-            reason.append(context.getString(R.string.uploads_view_later_reason_waiting_for) +
-                    DisplayUtils.unixTimeToHumanReadable(getUploadTimestamp()));
-        }
         if (isUseWifiOnly() && !UploadUtils.isConnectedViaWiFi(context)) {
             if (reason.length() > 0) {
                 reason.append(context.getString(R.string.uploads_view_later_reason_add_wifi_reason));

src/com/owncloud/android/db/ProviderMeta.java

@@ -134,10 +134,11 @@ public class ProviderMeta {
                 + " collate nocase asc";
 
         //Columns of Uploads table
-        public static final String UPLOADS_FILE_ID = "file_id";
-        public static final String UPLOADS_PATH = "path";
-        public static final String UPLOADS_STATUS = "status";
+        //public static final String UPLOADS_FILE_ID = "file_id";
+        public static final String UPLOADS_LOCAL_PATH = "local_path";
+        public static final String UPLOADS_REMOTE_PATH = "remote_path";
         public static final String UPLOADS_ACCOUNT_NAME = "account_name";
+        public static final String UPLOADS_STATUS = "status";
         public static final String UPLOADS_LOCAL_BEHAVIOUR = "local_behaviour";
         public static final String UPLOADS_UPLOAD_TIME = "upload_time";
         public static final String UPLOADS_FORCE_OVERWRITE = "force_overwrite";
@@ -147,6 +148,7 @@ public class ProviderMeta {
         public static final String UPLOADS_UPLOAD_TIMESTAMP = "upload_timestamp";
         public static final String UPLOADS_LAST_RESULT = "last_result";
 
-        public static final String UPLOADS_DEFAULT_SORT_ORDER = UPLOADS_FILE_ID  + " collate nocase asc";
+        //public static final String UPLOADS_DEFAULT_SORT_ORDER = UPLOADS_FILE_ID  + " collate nocase asc";
+        public static final String UPLOADS_DEFAULT_SORT_ORDER = ProviderTableMeta._ID  + " collate nocase desc";
     }
 }

src/com/owncloud/android/files/FileOperationsHelper.java

@@ -537,7 +537,7 @@ public class FileOperationsHelper {
             upload.removeAllUploadRestrictions(); //only this object, upload DB stays untouched.
             uploaderBinder.retry(account, upload);
         }  else {
-            Log_OC.w(TAG, "uploaderBinder not set. Cannot retry the upload of " + upload.getOCFile());
+            Log_OC.w(TAG, "uploaderBinder not set. Cannot retry the upload of " + upload.getLocalPath());
         }
     }
 
@@ -549,7 +549,7 @@ public class FileOperationsHelper {
         if (uploaderBinder != null) {
             uploaderBinder.remove(upload);
         }  else {
-            Log_OC.w(TAG, "uploaderBinder not set. Cannot remove " + upload.getOCFile());            
+            Log_OC.w(TAG, "uploaderBinder not set. Cannot remove " + upload.getLocalPath());
         }
     }
 
@@ -569,31 +569,6 @@ public class FileOperationsHelper {
 
         // for both files and folders
         FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder();
-// On reliable_uploads
-//        FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
-//        if (downloaderBinder != null) {
-//            if (downloaderBinder.isDownloading(account, file)) {
-//                // Remove etag for parent, if file is a keep_in_sync
-//                if (file.isFavorite()) {
-//                    OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId());
-//                    parent.setEtag("");
-//                    mFileActivity.getStorageManager().saveFile(parent);
-//                }
-//
-//                downloaderBinder.cancel(account, file);
-//            } else {
-//                Log_OC.d(TAG, "Download for " + file + " not in progress. Cannot cancel " + file);
-//            }
-//        }
-//        if (uploaderBinder != null) {
-//            if (uploaderBinder.isUploading(account, file)) {
-//                uploaderBinder.cancel(account, file);
-//            } else {
-//                Log_OC.d(TAG, "Upload for " + file + " not in progress. Cannot cancel.");
-//            }
-//        }
-//        if(downloaderBinder == null && uploaderBinder == null) {
-//            Log_OC.w(TAG, "Neither downloaderBinder nor uploaderBinder set. Cannot cancel.");
         if (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) {
             downloaderBinder.cancel(account, file);
         }

src/com/owncloud/android/files/services/FileDownloader.java

@@ -2,7 +2,7 @@
  *   ownCloud Android client application
  *
  *   Copyright (C) 2012 Bartek Przybylski
- *   Copyright (C) 2012-2015 ownCloud Inc.
+ *   Copyright (C) 2012-2016 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -172,7 +172,7 @@ public class FileDownloader extends Service
                 newDownload.addDatatransferProgressListener(this);
                 newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder);
                 Pair<String, String> putResult = mPendingDownloads.putIfAbsent(
-                        account, file.getRemotePath(), newDownload, null
+                        account.name, file.getRemotePath(), newDownload, null
                 );
                 if (putResult != null) {
                     String downloadKey = putResult.first;
@@ -253,7 +253,8 @@ public class FileDownloader extends Service
          * @param file    A file in the queue of pending downloads
          */
         public void cancel(Account account, OCFile file) {
-            Pair<DownloadFileOperation, String> removeResult = mPendingDownloads.remove(account, file.getRemotePath());
+            Pair<DownloadFileOperation, String> removeResult =
+                    mPendingDownloads.remove(account.name, file.getRemotePath());
             DownloadFileOperation download = removeResult.first;
             if (download != null) {
                 download.cancel();
@@ -301,7 +302,7 @@ public class FileDownloader extends Service
          */
         public boolean isDownloading(Account account, OCFile file) {
             if (account == null || file == null) return false;
-            return (mPendingDownloads.contains(account, file.getRemotePath()));
+            return (mPendingDownloads.contains(account.name, file.getRemotePath()));
         }
 
 
@@ -431,8 +432,10 @@ public class FileDownloader extends Service
 
                 } finally {
                     Pair<DownloadFileOperation, String> removeResult =
-                            mPendingDownloads.removePayload(mCurrentAccount,
-                                    mCurrentDownload.getRemotePath());
+                            mPendingDownloads.removePayload(
+                                    mCurrentAccount.name,
+                                    mCurrentDownload.getRemotePath()
+                            );
 
                     /// notify result
                     notifyDownloadResult(mCurrentDownload, downloadResult);
@@ -652,6 +655,6 @@ public class FileDownloader extends Service
      */
     private void cancelDownloadsForAccount(Account account) {
         // Cancel pending downloads
-        mPendingDownloads.remove(account);
+        mPendingDownloads.remove(account.name);
     }
 }

src/com/owncloud/android/files/services/FileUploader.java

@@ -72,7 +72,6 @@ import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.UploadListActivity;
 import com.owncloud.android.utils.ErrorMessageAdapter;
-import com.owncloud.android.utils.UriUtils;
 
 import java.io.File;
 import java.util.AbstractList;
@@ -243,9 +242,6 @@ public class FileUploader extends Service
     private NotificationCompat.Builder mNotificationBuilder;
     private int mLastPercent;
 
-    private static final String MIME_TYPE_PDF = "application/pdf";
-    private static final String FILE_EXTENSION_PDF = ".pdf";
-
     public static String getUploadStartMessage() {
         return FileUploader.class.getName() + UPLOAD_START_MESSAGE;
     }
@@ -517,8 +513,11 @@ public class FileUploader extends Service
 
                 files = new OCFile[localPaths.length];
                 for (int i = 0; i < localPaths.length; i++) {
-                    files[i] = obtainNewOCFileToUpload(remotePaths[i], localPaths[i],
-                            ((mimeTypes != null) ? mimeTypes[i] : null));
+                    files[i] = UploadFileOperation.obtainNewOCFileToUpload(
+                            remotePaths[i],
+                            localPaths[i],
+                            ((mimeTypes != null) ? mimeTypes[i] : null)
+                    );
                     if (files[i] == null) {
                         Log_OC.e(TAG, "obtainNewOCFileToUpload() returned null for remotePaths[i]:" + remotePaths[i]
                                 + " and localPaths[i]:" + localPaths[i]);
@@ -542,7 +541,7 @@ public class FileUploader extends Service
                             chunked,
                             forceOverwrite,
                             localAction,
-                            getApplicationContext()
+                            this
                     );
                     if (isCreateRemoteFolder) {
                         newUpload.setRemoteFolderToBeCreated();
@@ -551,14 +550,12 @@ public class FileUploader extends Service
                     newUpload.addDatatransferProgressListener((FileUploaderBinder) mBinder);
 
                     // Save upload in database
-                    OCUpload ocUpload = new OCUpload(files[i]);
-                    ocUpload.setAccountName(account.name);
+                    OCUpload ocUpload = new OCUpload(files[i], account);
                     ocUpload.setForceOverwrite(forceOverwrite);
                     ocUpload.setCreateRemoteFolder(isCreateRemoteFolder);
                     ocUpload.setLocalAction(localAction);
                     ocUpload.setUseWifiOnly(isUseWifiOnly);
                     ocUpload.setWhileChargingOnly(isWhileChargingOnly);
-//                    ocUpload.setUploadTimestamp(uploadTimestamp);
                     ocUpload.setUploadStatus(UploadStatus.UPLOAD_LATER);
 
                     // storagePath inside upload is the temporary path. file
@@ -567,7 +564,10 @@ public class FileUploader extends Service
                     newUpload.setOCUploadId(id);
 
                     Pair<String, String> putResult = mPendingUploads.putIfAbsent(
-                            account, files[i].getRemotePath(), newUpload, /*String.valueOf(id)*/ null
+                            account.name,
+                            files[i].getRemotePath(),
+                            newUpload,
+                            /*String.valueOf(id)*/ null
                     );
                     if (putResult != null) {
                         uploadKey = putResult.first;
@@ -591,8 +591,7 @@ public class FileUploader extends Service
                 return START_NOT_STICKY;
 
             }
-            // *** TODO REWRITE: block inserted to request retries in a raw; too many code copied, no control
-            // exception ***/
+            // *** TODO REWRITE: block inserted to request A retry; too many code copied, no control exception ***/
         } else {
             if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_RETRY_UPLOAD)) {
                 Log_OC.e(TAG, "Not enough information provided in intent: no KEY_RETRY_UPLOAD_KEY");
@@ -602,11 +601,11 @@ public class FileUploader extends Service
 
             UploadFileOperation newUpload = new UploadFileOperation(
                     account,
-                    upload.getOCFile(),
+                    upload,
                     chunked,
                     upload.isForceOverwrite(),
                     upload.getLocalAction(),
-                    getApplicationContext()
+                    this
             );
             if (upload.isCreateRemoteFolder()) {
                 newUpload.setRemoteFolderToBeCreated();
@@ -616,8 +615,11 @@ public class FileUploader extends Service
             newUpload.setOCUploadId(upload.getUploadId());
 
             Pair<String, String> putResult = mPendingUploads.putIfAbsent(
-                    account, upload.getOCFile().getRemotePath(), newUpload, String.valueOf(upload.getUploadId())
-            );
+                    account.name,
+                    upload.getRemotePath(),
+                    newUpload,
+                    String.valueOf(upload.getUploadId()
+            ));
             if (putResult != null) {
                 String uploadKey = putResult.first;
                 requestedUploads.add(uploadKey);
@@ -684,6 +686,7 @@ public class FileUploader extends Service
         private Map<String, OnDatatransferProgressListener> mBoundListeners =
                 new HashMap<String, OnDatatransferProgressListener>();
 
+
         /**
          * Cancels a pending or current upload of a remote file.
          *
@@ -691,35 +694,47 @@ public class FileUploader extends Service
          * @param file      A file in the queue of pending uploads
          */
         public void cancel(Account account, OCFile file) {
-            Pair<UploadFileOperation, String> removeResult = mPendingUploads.remove(account, file.getRemotePath());
+            cancel(account.name, file.getRemotePath(), file.getStoragePath());
+        }
+
+        /**
+         * Cancels a pending or current upload that was persisted.
+         *
+         * @param storedUpload    Upload operation persisted
+         */
+        public void cancel(OCUpload storedUpload) {
+            cancel(storedUpload.getAccountName(), storedUpload.getRemotePath(), storedUpload.getLocalPath());
+        }
+
+        /**
+         * Cancels a pending or current upload of a remote file.
+         *
+         * @param accountName   Local name of an ownCloud account where the remote file will be stored.
+         * @param remotePath    Remote target of the upload
+         * @param localPath     Absolute local path to the source file
+         */
+        private void cancel(String accountName, String remotePath, String localPath) {
+            Pair<UploadFileOperation, String> removeResult =
+                    mPendingUploads.remove(accountName, remotePath);
             UploadFileOperation upload = removeResult.first;
+            if (upload == null &&
+                    mCurrentUpload != null && mCurrentAccount != null &&
+                    mCurrentUpload.getRemotePath().startsWith(remotePath) &&
+                    accountName.equals(mCurrentAccount.name) ) {
+
+                upload = mCurrentUpload;
+            }
             if (upload != null) {
+                boolean pending = !upload.isUploadInProgress();
                 upload.cancel();
-            } else {
-                // updating current references (i.e., uploadStatus of current
-                // upload) is handled by updateDataseUploadResult() which is called
-                // after upload finishes. Following cancel call makes sure that is
-                // does finish right now.
-                if (mCurrentUpload != null && mCurrentAccount != null &&
-                        mCurrentUpload.isUploadInProgress() &&  // TODO added with reliale_uploads, to check
-                        mCurrentUpload.getRemotePath().startsWith(file.getRemotePath()) &&
-                        account.name.equals(mCurrentAccount.name)) {
-                    Log_OC.d(TAG, "Calling cancel for " + file.getRemotePath() + " during upload operation.");
-                    mCurrentUpload.cancel();
-//            } else if(mCancellationPossible.get()){
-//                Log_OC.d(TAG, "Calling cancel for " + file.getRemotePath() + " during preparing for upload.");
-//                mCancellationRequested.set(true);
-                } else {
-                    Log_OC.d(TAG, "Calling cancel for " + file.getRemotePath() + " while upload is pending.");
-                    // upload not in progress, but pending.
-                    // in this case we have to update the db here.
-                    //OCUpload upload = mPendingUploads.remove(buildRemoteName(account, file));
-                    OCUpload ocUpload = mUploadsStorageManager.getUploadByLocalPath(upload.getStoragePath())[0];
+                if (pending) {
+                    // need to update now table in mUploadsStorageManager, since the operation will not get
+                    // to be run by FileUploader#uploadFile
+                    OCUpload ocUpload =
+                            mUploadsStorageManager.getUploadByLocalPath(localPath)[0];
+                                // TODO bad idea, should search for account + remoteName, or uploadId
                     ocUpload.setUploadStatus(UploadStatus.UPLOAD_CANCELLED);
                     ocUpload.setLastResult(UploadResult.CANCELLED);
-                    // storagePath inside upload is the temporary path. file
-                    // contains the correct path used as db reference.
-                    ocUpload.getOCFile().setStoragePath(file.getStoragePath());
                     mUploadsStorageManager.updateUploadStatus(ocUpload);
                 }
             }
@@ -745,7 +760,8 @@ public class FileUploader extends Service
 
         // TODO: Review: Method from FileUploadService with some changes because the merge with FileUploader
         public void remove(Account account, OCFile file) {
-            Pair<UploadFileOperation, String> removeResult = mPendingUploads.remove(account, file.getRemotePath());
+            Pair<UploadFileOperation, String> removeResult =
+                    mPendingUploads.remove(account.name, file.getRemotePath());
             UploadFileOperation upload = removeResult.first;
             //OCUpload upload = mPendingUploads.remove(buildRemoteName(account, file));
             if (upload == null) {
@@ -797,7 +813,7 @@ public class FileUploader extends Service
         public boolean isUploading(Account account, OCFile file) {
             if (account == null || file == null)
                 return false;
-            return (mPendingUploads.contains(account, file.getRemotePath()));
+            return (mPendingUploads.contains(account.name, file.getRemotePath()));
         }
 
 
@@ -808,10 +824,31 @@ public class FileUploader extends Service
          * @param account       ownCloud account holding the file of interest.
          * @param file          {@link OCFile} of interest for listener.
          */
-        public void addDatatransferProgressListener(OnDatatransferProgressListener listener,
-                                                    Account account, OCFile file) {
+        public void addDatatransferProgressListener (
+                OnDatatransferProgressListener listener,
+                Account account,
+                OCFile file
+        ) {
             if (account == null || file == null || listener == null) return;
-            String targetKey = buildRemoteName(account, file);
+            String targetKey = buildRemoteName(account.name, file.getRemotePath());
+            mBoundListeners.put(targetKey, listener);
+        }
+
+
+        /**
+         * Adds a listener interested in the progress of the upload for a concrete file.
+         *
+         * @param listener      Object to notify about progress of transfer.
+         * @param account       ownCloud account holding the file of interest.
+         * @param ocUpload      {@link OCUpload} of interest for listener.
+         */
+        public void addDatatransferProgressListener (
+                OnDatatransferProgressListener listener,
+                Account account,
+                OCUpload ocUpload
+        ) {
+            if (account == null || ocUpload == null || listener == null) return;
+            String targetKey = buildRemoteName(account.name, ocUpload.getRemotePath());
             mBoundListeners.put(targetKey, listener);
         }
 
@@ -823,10 +860,33 @@ public class FileUploader extends Service
          * @param account       ownCloud account holding the file of interest.
          * @param file          {@link OCFile} of interest for listener.
          */
-        public void removeDatatransferProgressListener(OnDatatransferProgressListener listener,
-                                                       Account account, OCFile file) {
+        public void removeDatatransferProgressListener (
+                OnDatatransferProgressListener listener,
+                Account account,
+                OCFile file
+        ) {
             if (account == null || file == null || listener == null) return;
-            String targetKey = buildRemoteName(account, file);
+            String targetKey = buildRemoteName(account.name, file.getRemotePath());
+            if (mBoundListeners.get(targetKey) == listener) {
+                mBoundListeners.remove(targetKey);
+            }
+        }
+
+
+        /**
+         * Removes a listener interested in the progress of the upload for a concrete file.
+         *
+         * @param listener      Object to notify about progress of transfer.
+         * @param account       ownCloud account holding the file of interest.
+         * @param ocUpload      Stored upload of interest
+         */
+        public void removeDatatransferProgressListener (
+                OnDatatransferProgressListener listener,
+                Account account,
+                OCUpload ocUpload
+        ) {
+            if (account == null || ocUpload == null || listener == null) return;
+            String targetKey = buildRemoteName(account.name, ocUpload.getRemotePath());
             if (mBoundListeners.get(targetKey) == listener) {
                 mBoundListeners.remove(targetKey);
             }
@@ -837,7 +897,7 @@ public class FileUploader extends Service
         @Override
         public void onTransferProgress(long progressRate, long totalTransferredSoFar,
                                        long totalToTransfer, String fileName) {
-            String key = buildRemoteName(mCurrentUpload.getAccount(), mCurrentUpload.getFile());
+            String key = buildRemoteName(mCurrentUpload.getAccount().name, mCurrentUpload.getFile().getRemotePath());
             OnDatatransferProgressListener boundListener = mBoundListeners.get(key);
             if (boundListener != null) {
                 boundListener.onTransferProgress(progressRate, totalTransferredSoFar,
@@ -848,16 +908,17 @@ public class FileUploader extends Service
         /**
          * Builds a key for the map of listeners.
          *
-         * TODO remove and replace key with file.getFileId() after changing current policy (upload file, then
+         * TODO use method in IndexedForest, or refactor both to a common place
          * add to local database) to better policy (add to local database, then upload)
          *
-         * @param account       ownCloud account where the file to upload belongs.
-         * @param file          File to upload
-         * @return Key
+         * @param accountName   Local name of the ownCloud account where the file to upload belongs.
+         * @param remotePath    Remote path to upload the file to.
+         * @return              Key
          */
-        private String buildRemoteName(Account account, OCFile file) {
-            return account.name + file.getRemotePath();
+        private String buildRemoteName(String accountName, String remotePath) {
+            return accountName + remotePath;
         }
+
         /*private String buildRemoteName(Account account, OCFile file, long uploadId) {
             String suffix = String.valueOf(uploadId);
             if (uploadId != -1) {
@@ -968,15 +1029,14 @@ public class FileUploader extends Service
                     Pair<UploadFileOperation, String> removeResult;
                     if (mCurrentUpload.wasRenamed()) {
                         removeResult = mPendingUploads.removePayload(
-                                mCurrentAccount,
+                                mCurrentAccount.name,
                                 mCurrentUpload.getOldFile().getRemotePath()
                         );
-                        /** TODO NOW: double check */
-                        mUploadsStorageManager.updateFileIdUpload(mCurrentUpload.getOCUploadId(),
-                                mCurrentUpload.getFile().getFileId());
+                        /** TODO: grant that name is also updated for mCurrentUpload.getOCUploadId */
+
                     } else {
                         removeResult = mPendingUploads.removePayload(
-                                mCurrentAccount,
+                                mCurrentAccount.name,
                                 mCurrentUpload.getRemotePath()
                         );
                     }
@@ -1113,45 +1173,6 @@ public class FileUploader extends Service
         file.setRemoteId(remoteFile.getRemoteId());
     }
 
-    private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType) {
-
-        // MIME type
-        if (mimeType == null || mimeType.length() <= 0) {
-            try {
-                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
-                        remotePath.substring(remotePath.lastIndexOf('.') + 1));
-            } catch (IndexOutOfBoundsException e) {
-                Log_OC.e(TAG, "Trying to find out MIME type of a file without extension: " +
-                        remotePath);
-            }
-        }
-        if (mimeType == null) {
-            mimeType = "application/octet-stream";
-        }
-
-        if (isPdfFileFromContentProviderWithoutExtension(localPath, mimeType)) {
-            remotePath += FILE_EXTENSION_PDF;
-        }
-
-        OCFile newFile = new OCFile(remotePath);
-        newFile.setStoragePath(localPath);
-        newFile.setLastSyncDateForProperties(0);
-        newFile.setLastSyncDateForData(0);
-
-        // size
-        if (localPath != null && localPath.length() > 0) {
-            File localFile = new File(localPath);
-            newFile.setFileLength(localFile.length());
-            newFile.setLastSyncDateForData(localFile.lastModified());
-        } // don't worry about not assigning size, the problems with localPath
-        // are checked when the UploadFileOperation instance is created
-
-
-        newFile.setMimetype(mimeType);
-
-        return newFile;
-    }
-
     /**
      * Creates a status notification to show the upload progress
      *
@@ -1322,7 +1343,7 @@ public class FileUploader extends Service
 //                DbHandler db = new DbHandler(this.getBaseContext());
 //                db.removeIUPendingFile(mCurrentUpload.getOriginalStoragePath());
 //                db.close();
-                mPendingUploads.remove(upload.getAccount(), upload.getFile().getRemotePath());
+                mPendingUploads.remove(upload.getAccount().name, upload.getFile().getRemotePath());
                 //updateDatabaseUploadResult(uploadResult, mCurrentUpload);
                 // remove success notification, with a delay of 2 seconds
                 NotificationDelayer.cancelWithDelay(
@@ -1382,22 +1403,6 @@ public class FileUploader extends Service
         sendStickyBroadcast(end);
     }
 
-    /**
-     * Checks if content provider, using the content:// scheme, returns a file with mime-type 
-     * 'application/pdf' but file has not extension
-     * @param localPath         Full path to a file in the local file system.
-     * @param mimeType          MIME type of the file.
-     * @return true if is needed to add the pdf file extension to the file
-     *
-     * TODO - move to OCFile or Utils class
-     */
-    private boolean isPdfFileFromContentProviderWithoutExtension(String localPath,
-                                                                 String mimeType) {
-        return localPath.startsWith(UriUtils.URI_CONTENT_SCHEME) &&
-                mimeType.equals(MIME_TYPE_PDF) &&
-                !localPath.endsWith(FILE_EXTENSION_PDF);
-    }
-
     /**
      * Remove uploads of an account
      *
@@ -1405,7 +1410,7 @@ public class FileUploader extends Service
      */
     private void cancelUploadsForAccount(Account account) {
         // Cancel pending uploads
-        mPendingUploads.remove(account);
+        mPendingUploads.remove(account.name);
     }
 
     /**

src/com/owncloud/android/files/services/IndexedForest.java

@@ -20,7 +20,6 @@
 
 package com.owncloud.android.files.services;
 
-import android.accounts.Account;
 import android.util.Pair;
 
 import com.owncloud.android.datamodel.OCFile;
@@ -98,9 +97,9 @@ public class IndexedForest<V> {
     }
 
 
-    public /* synchronized */ Pair<String, String> putIfAbsent(Account account, String remotePath, V value,
+    public /* synchronized */ Pair<String, String> putIfAbsent(String accountName, String remotePath, V value,
                                                                String keySufix) {
-        String targetKey = buildKey(account, remotePath);
+        String targetKey = buildKey(accountName, remotePath);
         if (keySufix != null){
             targetKey = targetKey + keySufix;
         }
@@ -123,7 +122,7 @@ public class IndexedForest<V> {
                 if (!parentPath.endsWith(OCFile.PATH_SEPARATOR)) {
                     parentPath += OCFile.PATH_SEPARATOR;
                 }
-                parentKey = buildKey(account, parentPath);
+                parentKey = buildKey(accountName, parentPath);
                 parentNode = mMap.get(parentKey);
                 if (parentNode == null) {
                     parentNode = new Node(parentKey, null);
@@ -139,7 +138,7 @@ public class IndexedForest<V> {
 
             String linkedTo = OCFile.ROOT_PATH;
             if (linked) {
-                linkedTo = parentNode.getKey().substring(account.name.length());
+                linkedTo = parentNode.getKey().substring(accountName.length());
             }
 
             return new Pair<String, String>(targetKey, linkedTo);
@@ -147,21 +146,21 @@ public class IndexedForest<V> {
     };
 
 
-    public Pair<V, String> removePayload(Account account, String remotePath) {
-        String targetKey = buildKey(account, remotePath);
+    public Pair<V, String> removePayload(String accountName, String remotePath) {
+        String targetKey = buildKey(accountName, remotePath);
         Node<V> target = mMap.get(targetKey);
         if (target != null) {
             target.clearPayload();
             if (!target.hasChildren()) {
-                return remove(account, remotePath);
+                return remove(accountName, remotePath);
             }
         }
         return new Pair<V, String>(null, null);
     }
 
 
-    public /* synchronized */ Pair<V, String> remove(Account account, String remotePath) {
-        String targetKey = buildKey(account, remotePath);
+    public /* synchronized */ Pair<V, String> remove(String accountName, String remotePath) {
+        String targetKey = buildKey(accountName, remotePath);
         Node<V> firstRemoved = mMap.remove(targetKey);
         String unlinkedFrom = null;
 
@@ -184,7 +183,7 @@ public class IndexedForest<V> {
             }
 
             if (parent != null) {
-                unlinkedFrom = parent.getKey().substring(account.name.length());
+                unlinkedFrom = parent.getKey().substring(accountName.length());
             }
 
             return new Pair<V, String>(firstRemoved.getPayload(), unlinkedFrom);
@@ -203,8 +202,8 @@ public class IndexedForest<V> {
         }
     }
 
-    public boolean contains(Account account, String remotePath) {
-        String targetKey = buildKey(account, remotePath);
+    public boolean contains(String accountName, String remotePath) {
+        String targetKey = buildKey(accountName, remotePath);
         return mMap.containsKey(targetKey);
     }
 
@@ -217,22 +216,22 @@ public class IndexedForest<V> {
         }
     }
 
-    public V get(Account account, String remotePath) {
-        String key = buildKey(account, remotePath);
+    public V get(String accountName, String remotePath) {
+        String key = buildKey(accountName, remotePath);
         return get(key);
     }
 
 
     /**
      * Remove the elements that contains account as a part of its key
-     * @param account
+     * @param accountName
      */
-    public void remove(Account account){
+    public void remove(String accountName){
         Iterator<String> it = mMap.keySet().iterator();
         while (it.hasNext()) {
             String key = it.next();
             Log_OC.d("IndexedForest", "Number of pending downloads= "  + mMap.size());
-            if (key.startsWith(account.name)) {
+            if (key.startsWith(accountName)) {
                 mMap.remove(key);
             }
         }
@@ -241,11 +240,11 @@ public class IndexedForest<V> {
     /**
      * Builds a key to index files
      *
-     * @param account       Account where the file to download is stored
-     * @param remotePath    Path of the file in the server
+     * @param accountName   Local name of the ownCloud account where the file to download is stored.
+     * @param remotePath    Path of the file in the server.
      */
-    private String buildKey(Account account, String remotePath) {
-        return account.name + remotePath;
+    private String buildKey(String accountName, String remotePath) {
+        return accountName + remotePath;
     }
 
 }

src/com/owncloud/android/operations/UploadFileOperation.java

@@ -27,6 +27,7 @@ import android.net.Uri;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
@@ -40,6 +41,7 @@ import com.owncloud.android.lib.resources.files.ChunkedUploadRemoteFileOperation
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
 import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
+import com.owncloud.android.utils.MimetypeIconUtil;
 import com.owncloud.android.utils.UriUtils;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -63,6 +65,59 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class UploadFileOperation extends RemoteOperation {
 
+
+    private static final String MIME_TYPE_PDF = "application/pdf";
+    private static final String FILE_EXTENSION_PDF = ".pdf";
+
+    /**
+     * Checks if content provider, using the content:// scheme, returns a file with mime-type
+     * 'application/pdf' but file has not extension
+     * @param localPath         Full path to a file in the local file system.
+     * @param mimeType          MIME type of the file.
+     * @return true if is needed to add the pdf file extension to the file
+     *
+     * TODO - move to OCFile or Utils class
+     */
+    private static boolean isPdfFileFromContentProviderWithoutExtension(String localPath,
+                                                                 String mimeType) {
+        return localPath.startsWith(UriUtils.URI_CONTENT_SCHEME) &&
+                mimeType.equals(MIME_TYPE_PDF) &&
+                !localPath.endsWith(FILE_EXTENSION_PDF);
+    }
+
+    public static OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType) {
+
+        // MIME type
+        if (mimeType == null || mimeType.length() <= 0) {
+            mimeType = MimetypeIconUtil.getBestMimeTypeByFilename(localPath);
+        }
+
+        // TODO - this is a horrible special case that should not be handled this way
+        if (isPdfFileFromContentProviderWithoutExtension(localPath, mimeType)){
+            remotePath += FILE_EXTENSION_PDF;
+        }
+
+        OCFile newFile = new OCFile(remotePath);
+        newFile.setStoragePath(localPath);
+        newFile.setLastSyncDateForProperties(0);
+        newFile.setLastSyncDateForData(0);
+
+        // size
+        if (localPath != null && localPath.length() > 0) {
+            File localFile = new File(localPath);
+            newFile.setFileLength(localFile.length());
+            newFile.setLastSyncDateForData(localFile.lastModified());
+        } // don't worry about not assigning size, the problems with localPath
+        // are checked when the UploadFileOperation instance is created
+
+
+        newFile.setMimetype(mimeType);
+
+        return newFile;
+    }
+
+
+
     private static final String TAG = UploadFileOperation.class.getSimpleName();
 
     private Account mAccount;
@@ -126,6 +181,39 @@ public class UploadFileOperation extends RemoteOperation {
         mContext = context;
     }
 
+    public UploadFileOperation(Account account,
+                               OCUpload upload,
+                               boolean chunked,
+                               boolean forceOverwrite,
+                               int localBehaviour,
+                               Context context
+    ) {
+        if (account == null)
+            throw new IllegalArgumentException("Illegal NULL account in UploadFileOperation " +
+                    "creation");
+        if (upload == null)
+            throw new IllegalArgumentException("Illegal NULL file in UploadFileOperation creation");
+        if (upload.getLocalPath() == null || upload.getLocalPath().length() <= 0) {
+            throw new IllegalArgumentException(
+                    "Illegal file in UploadFileOperation; storage path invalid: "
+                            + upload.getLocalPath());
+        }
+
+        mAccount = account;
+        mFile = obtainNewOCFileToUpload(
+                upload.getRemotePath(),
+                upload.getLocalPath(),
+                getMimeType()
+        );
+        mRemotePath = upload.getRemotePath();
+        mChunked = chunked;
+        mForceOverwrite = forceOverwrite;
+        mLocalBehaviour = localBehaviour;
+        mOriginalStoragePath = mFile.getStoragePath();
+        mOriginalFileName = mFile.getFileName();
+        mContext = context;
+    }
+
     public Account getAccount() {
         return mAccount;
     }

src/com/owncloud/android/providers/FileContentProvider.java

@@ -846,10 +846,11 @@ public class FileContentProvider extends ContentProvider {
         // Create uploads table
         db.execSQL("CREATE TABLE " + ProviderTableMeta.UPLOADS_TABLE_NAME + "("
                 + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
-                + ProviderTableMeta.UPLOADS_FILE_ID + " INTEGER, "
-                + ProviderTableMeta.UPLOADS_PATH + " TEXT, "
-                + ProviderTableMeta.UPLOADS_STATUS + " INTEGER, "               // UploadStatus
+                //+ ProviderTableMeta.UPLOADS_FILE_ID + " INTEGER, "
+                + ProviderTableMeta.UPLOADS_LOCAL_PATH + " TEXT, "
+                + ProviderTableMeta.UPLOADS_REMOTE_PATH + " TEXT, "
                 + ProviderTableMeta.UPLOADS_ACCOUNT_NAME + " TEXT, "
+                + ProviderTableMeta.UPLOADS_STATUS + " INTEGER, "               // UploadStatus
                 + ProviderTableMeta.UPLOADS_LOCAL_BEHAVIOUR + " INTEGER, "      // Upload LocalBehaviour
                 + ProviderTableMeta.UPLOADS_UPLOAD_TIME + " INTEGER, "
                 + ProviderTableMeta.UPLOADS_FORCE_OVERWRITE + " INTEGER, "  // boolean

src/com/owncloud/android/services/SyncFolderHandler.java

@@ -82,7 +82,7 @@ class SyncFolderHandler extends Handler {
      */
     public boolean isSynchronizing(Account account, String remotePath) {
         if (account == null || remotePath == null) return false;
-        return (mPendingOperations.contains(account, remotePath));
+        return (mPendingOperations.contains(account.name, remotePath));
     }
 
 
@@ -100,7 +100,7 @@ class SyncFolderHandler extends Handler {
      */
     private void doOperation(Account account, String remotePath) {
 
-        mCurrentSyncOperation = mPendingOperations.get(account, remotePath);
+        mCurrentSyncOperation = mPendingOperations.get(account.name, remotePath);
 
         if (mCurrentSyncOperation != null) {
             RemoteOperationResult result = null;
@@ -127,7 +127,7 @@ class SyncFolderHandler extends Handler {
             } catch (IOException e) {
                 Log_OC.e(TAG, "Error while trying to get authorization", e);
             } finally {
-                mPendingOperations.removePayload(account, remotePath);
+                mPendingOperations.removePayload(account.name, remotePath);
 
                 mService.dispatchResultToOperationListeners(mCurrentSyncOperation, result);
 
@@ -139,7 +139,7 @@ class SyncFolderHandler extends Handler {
     public void add(Account account, String remotePath,
                     SynchronizeFolderOperation syncFolderOperation){
         Pair<String, String> putResult =
-                mPendingOperations.putIfAbsent(account, remotePath, syncFolderOperation, null);
+                mPendingOperations.putIfAbsent(account.name, remotePath, syncFolderOperation, null);
         if (putResult != null) {
             sendBroadcastNewSyncFolder(account, remotePath);    // TODO upgrade!
         }
@@ -149,7 +149,7 @@ class SyncFolderHandler extends Handler {
     /**
      * Cancels a pending or current sync' operation.
      *
-     * @param account       ownCloud account where the remote file is stored.
+     * @param account       ownCloud {@link Account} where the remote file is stored.
      * @param file          A file in the queue of pending synchronizations
      */
     public void cancel(Account account, OCFile file){
@@ -158,7 +158,7 @@ class SyncFolderHandler extends Handler {
             return;
         }
         Pair<SynchronizeFolderOperation, String> removeResult =
-                mPendingOperations.remove(account, file.getRemotePath());
+                mPendingOperations.remove(account.name, file.getRemotePath());
         SynchronizeFolderOperation synchronization = removeResult.first;
         if (synchronization != null) {
             synchronization.cancel();

src/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -165,6 +165,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
      * WARNING! This opens the local copy inside owncloud directory. If file not uploaded yet,
      * there is none.
      */
+    /*
     @SuppressWarnings("unused")
     private void openPreview(OCUpload file) {
      // preview image
@@ -173,7 +174,9 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
         startActivity(showDetailsIntent);  
     }
-    
+    */
+
+    /*
     @SuppressWarnings("unused")
     private void openDetails(OCUpload file) {
         OCFile ocFile = file.getOCFile();
@@ -182,6 +185,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, file.getAccount(this));
         startActivity(showDetailsIntent);
     }
+    */
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -47,7 +47,6 @@ import com.owncloud.android.db.UploadResult;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
@@ -72,7 +71,6 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
     private UploadsStorageManager mUploadsStorageManager;
 
     public ProgressListener mProgressListener;
-    private UploadFileOperation mCurrentUpload;
 
     interface Refresh {
         public void refresh();
@@ -90,11 +88,15 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
         public Comparator<OCUpload> comparator = new Comparator<OCUpload>() {
             @Override
             public int compare(OCUpload lhs, OCUpload rhs) {
-                return compareUploadTime(lhs, rhs);
+                return compareUploadId(lhs, rhs);
             }
-            private int compareUploadTime(OCUpload lhs, OCUpload rhs) {
-                return Long.valueOf(rhs.getOCFile().getModificationTimestamp()).
-                        compareTo(lhs.getOCFile().getModificationTimestamp());
+            private int compareUploadId(OCUpload lsh, OCUpload rsh) {
+                return Long.valueOf(lsh.getUploadId()).compareTo(rsh.getUploadId());
+            }
+            private int compareUpdateTime(OCUpload lhs, OCUpload rhs) {
+                long lLastModified = new File(lhs.getLocalPath()).lastModified();
+                long rLastModified = new File(rhs.getLocalPath()).lastModified();
+                return Long.valueOf(rLastModified).compareTo(lLastModified);
             }
         };
         abstract public int getGroupIcon();
@@ -195,24 +197,32 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
 
         if (uploadsItems != null && uploadsItems.length > position) {
             final OCUpload upload = uploadsItems[position];
-            final OCFile uploadOCFile = upload.getOCFile();
 
+            // local file name
             TextView fileTextView = (TextView) view.findViewById(R.id.upload_name);
-            String fileName = uploadOCFile.getFileName();
+            File localFile = new File(upload.getLocalPath());
+            String fileName = localFile.getName();
+            if (fileName.length() == 0) {
+                fileName = File.separator;
+            }
             fileTextView.setText(fileName);
 
+            // remote path to parent folder
             TextView pathTextView = (TextView) view.findViewById(R.id.upload_local_path);
-            String path = uploadOCFile.getRemotePath();
-            path = (path == null || path.isEmpty()) ? "" : path.substring(0, path.length() - fileName.length() - 1);
-            pathTextView.setText(mParentActivity.getString(R.string.app_name) + path);
+            String remoteParentPath = upload.getRemotePath();
+            remoteParentPath = new File(remoteParentPath).getParent();
+            pathTextView.setText(mParentActivity.getString(R.string.app_name) + remoteParentPath);
 
+            // file size
             TextView fileSizeTextView = (TextView) view.findViewById(R.id.upload_file_size);
-            fileSizeTextView.setText(DisplayUtils.bytesToHumanReadable(uploadOCFile.getFileLength()) + ", ");
+            fileSizeTextView.setText(DisplayUtils.bytesToHumanReadable(localFile.length()) + ", ");
 
+            //* upload date
             TextView uploadDateTextView = (TextView) view.findViewById(R.id.upload_date);
+            long updateTime = (new File(upload.getLocalPath())).lastModified();
             CharSequence dateString = DisplayUtils.getRelativeDateTimeString(
                     mParentActivity,
-                    uploadOCFile.getModificationTimestamp(),
+                    updateTime,
                     DateUtils.SECOND_IN_MILLIS,
                     DateUtils.WEEK_IN_MILLIS,
                     0
@@ -240,8 +250,11 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                     progressBar.setVisibility(View.VISIBLE);
                     mProgressListener = new ProgressListener(progressBar);
                     if(mParentActivity.getFileUploaderBinder() != null) {
-                        mParentActivity.getFileUploaderBinder().addDatatransferProgressListener(mProgressListener,
-                                mParentActivity.getAccount(), uploadOCFile /*, upload.getUploadId() */);
+                        mParentActivity.getFileUploaderBinder().addDatatransferProgressListener(
+                                mProgressListener,
+                                mParentActivity.getAccount(),
+                                upload
+                        );
                     } else {
                         Log_OC.e(TAG, "UploadBinder == null. It should have been created on creating mParentActivity"
                                 + " which inherits from FileActivity. Fix that!");
@@ -343,13 +356,13 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             if(upload.getUploadStatus() != UploadStatus.UPLOAD_IN_PROGRESS) {
                 ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.upload_progress_bar);
                 progressBar.setVisibility(View.GONE);
-                if (mParentActivity.getFileUploaderBinder() != null && mProgressListener != null
-                        && mCurrentUpload != null) {
-                    OCFile currentOcFile = mCurrentUpload.getFile();
-                    mParentActivity.getFileUploaderBinder().removeDatatransferProgressListener(mProgressListener,
-                            upload.getAccount(mParentActivity), currentOcFile /*, upload.getUploadId() */);
+                if (mParentActivity.getFileUploaderBinder() != null && mProgressListener != null) {
+                    mParentActivity.getFileUploaderBinder().removeDatatransferProgressListener(
+                            mProgressListener,
+                            upload.getAccount(mParentActivity),
+                            upload
+                    );
                     mProgressListener = null;
-                    mCurrentUpload = null;
                 }
             }
             statusTextView.setText(status);
@@ -361,7 +374,10 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                 rightButton.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        mParentActivity.getFileOperationsHelper().cancelTransference(uploadOCFile);
+                        FileUploader.FileUploaderBinder uploaderBinder = mParentActivity.getFileUploaderBinder();
+                        if (uploaderBinder != null) {
+                            uploaderBinder.cancel(upload);
+                        }
                     }
                 });
             } else {
@@ -392,16 +408,24 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             /** Cancellation needs do be checked and done before changing the drawable in fileIcon, or
              * {@link ThumbnailsCacheManager#cancelPotentialWork} will NEVER cancel any task.
              **/
-            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialWork(uploadOCFile,
-                    fileIcon));
+            OCFile fakeFileToCheatThumbnailsCacheManagerInterface = new OCFile(upload.getRemotePath());
+            fakeFileToCheatThumbnailsCacheManagerInterface.setStoragePath(upload.getLocalPath());
+            fakeFileToCheatThumbnailsCacheManagerInterface.setMimetype(upload.getMimeType());
+
+            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialWork(
+                    fakeFileToCheatThumbnailsCacheManagerInterface,
+                    fileIcon)
+            );
 
-            if ((uploadOCFile.isImage() && uploadOCFile.getRemoteId() != null &&
+            // TODO this code is duplicated; refactor to a common place
+            if ((fakeFileToCheatThumbnailsCacheManagerInterface.isImage()
+                    && fakeFileToCheatThumbnailsCacheManagerInterface.getRemoteId() != null &&
                     upload.getUploadStatus() == UploadStatus.UPLOAD_SUCCEEDED)){
                 // Thumbnail in Cache?
                 Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
-                        String.valueOf(uploadOCFile.getRemoteId())
+                        String.valueOf(fakeFileToCheatThumbnailsCacheManagerInterface.getRemoteId())
                 );
-                if (thumbnail != null && !uploadOCFile.needsUpdateThumbnail()){
+                if (thumbnail != null && !fakeFileToCheatThumbnailsCacheManagerInterface.needsUpdateThumbnail()){
                     fileIcon.setImageBitmap(thumbnail);
                 } else {
                     // generate new Thumbnail
@@ -420,18 +444,18 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                                         task
                                 );
                         fileIcon.setImageDrawable(asyncDrawable);
-                        task.execute(uploadOCFile);
+                        task.execute(fakeFileToCheatThumbnailsCacheManagerInterface);
                     }
                 }
 
-                if (uploadOCFile.getMimetype().equalsIgnoreCase("image/png")) {
+                if ("image/png".equals(upload.getMimeType())) {
                     fileIcon.setBackgroundColor(mParentActivity.getResources()
                             .getColor(R.color.background_color));
                 }
 
 
-            } else if (uploadOCFile.isImage() && uploadOCFile.getStoragePath() != null) {
-                File file = new File(uploadOCFile.getStoragePath());
+            } else if (fakeFileToCheatThumbnailsCacheManagerInterface.isImage()) {
+                File file = new File(upload.getLocalPath());
                 // Thumbnail in Cache?
                 Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                         String.valueOf(file.hashCode()));
@@ -457,13 +481,15 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                     }
                 }
 
-                if (uploadOCFile.getMimetype().equalsIgnoreCase("image/png")) {
+                if ("image/png".equalsIgnoreCase(upload.getMimeType())) {
                     fileIcon.setBackgroundColor(mParentActivity.getResources()
                             .getColor(R.color.background_color));
                 }
             } else {
-                fileIcon.setImageResource(MimetypeIconUtil.getFileTypeIconId(upload.getMimeType(),
-                        uploadOCFile.getFileName()));
+                fileIcon.setImageResource(MimetypeIconUtil.getFileTypeIconId(
+                        upload.getMimeType(),
+                        fileName
+                ));
             }
 
         }

src/com/owncloud/android/ui/fragment/UploadListFragment.java

@@ -19,6 +19,7 @@
  */
 package com.owncloud.android.ui.fragment;
 
+import android.accounts.Account;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,9 +33,12 @@ import android.view.ViewGroup;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.ListView;
+import android.widget.Toast;
 
 import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.OCUpload;
+import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -164,7 +168,10 @@ public class UploadListFragment extends ExpandableListFragment {
         OCUpload uploadFile = (OCUpload) mAdapter.getChild(groupPosition, childPosition);
         switch (item.getItemId()) {
         case R.id.action_cancel_upload:
-            ((FileActivity) getActivity()).getFileOperationsHelper().cancelTransference(uploadFile.getOCFile());
+            FileUploader.FileUploaderBinder uploaderBinder = ((FileActivity) getActivity()).getFileUploaderBinder();
+            if (uploaderBinder != null) {
+                uploaderBinder.cancel(uploadFile);
+            }
             return true;
         case R.id.action_remove_upload: {
             ((FileActivity) getActivity()).getFileOperationsHelper().removeUploadFromList(uploadFile);
@@ -172,15 +179,19 @@ public class UploadListFragment extends ExpandableListFragment {
 //        }case R.id.action_retry_upload: {
 //            ((FileActivity) getActivity()).getFileOperationsHelper().retryUpload(uploadFile);
 //            return true;
-        }case R.id.action_see_details: {
+        } case R.id.action_see_details: {
+            Toast.makeText(getActivity(), "TO DO", Toast.LENGTH_SHORT).show();
+            /*
             Intent showDetailsIntent = new Intent(getActivity(), FileDisplayActivity.class);
             showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, uploadFile.getOCFile());
             showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, uploadFile.getAccount(getActivity()));
             startActivity(showDetailsIntent);
+            */
             return true;
         }
         case R.id.action_open_file_with: {
-            ((FileActivity) getActivity()).getFileOperationsHelper().openFile(uploadFile.getOCFile());
+            Toast.makeText(getActivity(), "TO DO", Toast.LENGTH_SHORT).show();
+            //((FileActivity) getActivity()).getFileOperationsHelper().openFile(uploadFile.getOCFile());
             return true;
         }
         default:

src/com/owncloud/android/utils/MimetypeIconUtil.java

@@ -83,6 +83,21 @@ public class MimetypeIconUtil {
         return R.drawable.ic_menu_archive;
     }
 
+    /**
+     * Returns a single MIME type of all the possible, by inspection of the file extension, and taking
+     * into account the MIME types known by ownCloud first.
+     *
+     * @param filename      Name of file
+     * @return              A single MIME type, "application/octet-stream" for unknown file extensions.
+     */
+    public static String getBestMimeTypeByFilename(String filename) {
+        List<String> candidates = determineMimeTypesByFilename(filename);
+        if (candidates == null || candidates.size() < 1) {
+            return "application/octet-stream";
+        }
+        return candidates.get(0);
+    }
+
     /**
      * determines the icon based on the mime type.
      *