Show current uploads in uploads list view. Apply code review changes, merging FileUpload + FileUploadService

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

@@ -20,9 +20,6 @@
  */
 package com.owncloud.android.datamodel;
 
-import java.io.File;
-import java.util.Observable;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -31,10 +28,12 @@ import android.net.Uri;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.db.UploadResult;
-import com.owncloud.android.files.services.FileUploadService;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.utils.FileStorageUtils;
 
+import java.io.File;
+import java.util.Observable;
+
 /**
  * Database helper for storing list of files to be uploaded, including status
  * information for each file.
@@ -388,8 +387,7 @@ public class UploadsStorageManager extends Observable {
             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.setLocalAction(FileUploadService.LocalBehaviour.fromValue(
-                    c.getInt(c.getColumnIndex((ProviderTableMeta.UPLOADS_LOCAL_BEHAVIOUR)))));
+            upload.setLocalAction(c.getInt(c.getColumnIndex((ProviderTableMeta.UPLOADS_LOCAL_BEHAVIOUR))));
             upload.setForceOverwrite(c.getInt(
                     c.getColumnIndex(ProviderTableMeta.UPLOADS_FORCE_OVERWRITE)) == 1 );
             upload.setCreateRemoteFolder(c.getInt(

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

@@ -27,7 +27,7 @@ import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus;
-import com.owncloud.android.files.services.FileUploadService.LocalBehaviour;
+import com.owncloud.android.files.services.FileUploadService;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.util.Calendar;
@@ -49,9 +49,9 @@ public class OCUpload {
 
     private OCFile mFile;
     /**
-     * Local action for upload.
+     * Local action for upload. (0 - COPY, 1 - MOVE, 2 - FORGET)
      */
-    private LocalBehaviour mLocalAction;
+    private int mLocalAction;
     /**
      * Date and time when this upload was first requested.
      */
@@ -99,7 +99,7 @@ public class OCUpload {
     // TODO needed???
     private void resetData(){
         mId = -1;
-        mLocalAction = LocalBehaviour.LOCAL_BEHAVIOUR_COPY;
+        mLocalAction = FileUploadService.LOCAL_BEHAVIOUR_COPY;
         mUploadTime = new GregorianCalendar();
         mForceOverwrite = false;
         mIsCreateRemoteFolder = false;
@@ -182,15 +182,14 @@ public class OCUpload {
     /**
      * @return the localAction
      */
-    public LocalBehaviour getLocalAction() {
-        // return null;
+    public int getLocalAction() {
         return mLocalAction;
     }
 
     /**
      * @param localAction the localAction to set
      */
-    public void setLocalAction(LocalBehaviour localAction) {
+    public void setLocalAction(int localAction) {
         this.mLocalAction = localAction;
     }
 

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

@@ -504,19 +504,19 @@ public class FileOperationsHelper {
                 getString(R.string.wait_a_moment));
     }
 
-    /**
-     * Retry uploading a failed or cancelled upload with force.
-     */
-    public void retryUpload(OCUpload upload) {
-        Account account = mFileActivity.getAccount();
-        FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
-        if (uploaderBinder != null) {
-            upload.removeAllUploadRestrictions(); //only this object, upload DB stays untouched.
-            uploaderBinder.retry(account, upload);            
-        }  else {
-            Log_OC.w(TAG, "uploaderBinder not set. Cannot remove " + upload.getOCFile());            
-        }
-    }
+//    /**
+//     * Retry uploading a failed or cancelled upload with force.
+//     */
+//    public void retryUpload(OCUpload upload) {
+//        Account account = mFileActivity.getAccount();
+//        FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
+//        if (uploaderBinder != null) {
+//            upload.removeAllUploadRestrictions(); //only this object, upload DB stays untouched.
+//            uploaderBinder.retry(account, upload);
+//        }  else {
+//            Log_OC.w(TAG, "uploaderBinder not set. Cannot remove " + upload.getOCFile());
+//        }
+//    }
     
     /**
      * Remove upload from upload list.

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

@@ -71,7 +71,7 @@ public class ConnectivityActionReceiver extends BroadcastReceiver {
                 intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
             if(networkInfo.isConnected()) {
                 Log_OC.d(TAG, "Wifi is connected: " + String.valueOf(networkInfo));
-                wifiConnected(context);
+//                wifiConnected(context);
             }
         } else if(intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
             ConnectivityManager cm =
@@ -86,10 +86,10 @@ public class ConnectivityActionReceiver extends BroadcastReceiver {
         
     }
 
-    private void wifiConnected(Context context) {
-        Log_OC.d(TAG, "FileUploadService.retry() called by onReceive()");
-      FileUploadService.retry(context);        
-    }
+//    private void wifiConnected(Context context) {
+//        Log_OC.d(TAG, "FileUploadService.retry() called by onReceive()");
+//      FileUploadService.retry(context);
+//    }
 
     private void wifiDisconnected(Context context) {
         

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

@@ -111,10 +111,10 @@ public class FileUploadService extends Service implements OnDatatransferProgress
     public static final String KEY_REMOTE_FILE = "REMOTE_FILE";
     public static final String KEY_MIME_TYPE = "MIME_TYPE";
     
-    /**
-     * Call this Service with only this Intent key if all pending uploads are to be retried.
-     */
-    private static final String KEY_RETRY = "KEY_RETRY";
+//    /**
+//     * Call this Service with only this Intent key if all pending uploads are to be retried.
+//     */
+//    private static final String KEY_RETRY = "KEY_RETRY";
     /**
      * Call this Service with KEY_RETRY and KEY_RETRY_REMOTE_PATH to retry
      * download of file identified by KEY_RETRY_REMOTE_PATH.
@@ -125,7 +125,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
      */
     public static final String KEY_ACCOUNT = "ACCOUNT";
     /**
-     * Set whether single file or multiple files are to be uploaded. Value must be of type {@link UploadQuantity}.
+     * Set whether single file or multiple files are to be uploaded. SINGLE_FILES = 0, MULTIPLE_FILEs = 1.
      */
     public static final String KEY_UPLOAD_TYPE = "UPLOAD_TYPE";
     /**
@@ -144,10 +144,10 @@ public class FileUploadService extends Service implements OnDatatransferProgress
      * Set to true if upload is to performed only when phone is being charged.
      */
     public static final String KEY_WHILE_CHARGING_ONLY = "KEY_WHILE_CHARGING_ONLY";
-    /**
-     * Set to future UNIX timestamp. Upload will not be performed before this timestamp.
-     */
-    public static final String KEY_UPLOAD_TIMESTAMP= "KEY_UPLOAD_TIMESTAMP";
+//    /**
+//     * Set to future UNIX timestamp. Upload will not be performed before this timestamp.
+//     */
+//    public static final String KEY_UPLOAD_TIMESTAMP= "KEY_UPLOAD_TIMESTAMP";
     
     public static final String KEY_LOCAL_BEHAVIOUR = "BEHAVIOUR";
 
@@ -163,46 +163,46 @@ public class FileUploadService extends Service implements OnDatatransferProgress
     /**
      * Describes local behavior for upload.
      */
-    public enum LocalBehaviour {
-        /**
-         * Creates a copy of file and stores it in tmp folder inside owncloud
-         * folder on sd-card. After upload it is moved to local owncloud
-         * storage. Original file stays untouched.
-         */
-        LOCAL_BEHAVIOUR_COPY(0),
-        /**
-         * Upload file from current storage. Afterwards original file is move to
-         * local owncloud storage.
-         */
-        LOCAL_BEHAVIOUR_MOVE(1),
-        /**
-         * Just uploads file and leaves it where it is. Original file stays
-         * untouched.
-         */
-        LOCAL_BEHAVIOUR_FORGET(2);
-        private final int value;
-
-        LocalBehaviour(int value) {
-            this.value = value;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public static LocalBehaviour fromValue(int value){
-            switch (value)
-            {
-                case 0:
-                    return LOCAL_BEHAVIOUR_COPY;
-                case 1:
-                    return LOCAL_BEHAVIOUR_MOVE;
-                case 2:
-                    return LOCAL_BEHAVIOUR_FORGET;
-            }
-            return null;
-        }
-    }
+//    public enum LocalBehaviour {
+//        /**
+//         * Creates a copy of file and stores it in tmp folder inside owncloud
+//         * folder on sd-card. After upload it is moved to local owncloud
+//         * storage. Original file stays untouched.
+//         */
+//        LOCAL_BEHAVIOUR_COPY(0),
+//        /**
+//         * Upload file from current storage. Afterwards original file is move to
+//         * local owncloud storage.
+//         */
+//        LOCAL_BEHAVIOUR_MOVE(1),
+//        /**
+//         * Just uploads file and leaves it where it is. Original file stays
+//         * untouched.
+//         */
+//        LOCAL_BEHAVIOUR_FORGET(2);
+//        private final int value;
+//
+//        LocalBehaviour(int value) {
+//            this.value = value;
+//        }
+//
+//        public int getValue() {
+//            return value;
+//        }
+//
+//        public static LocalBehaviour fromValue(int value){
+//            switch (value)
+//            {
+//                case 0:
+//                    return LOCAL_BEHAVIOUR_COPY;
+//                case 1:
+//                    return LOCAL_BEHAVIOUR_MOVE;
+//                case 2:
+//                    return LOCAL_BEHAVIOUR_FORGET;
+//            }
+//            return null;
+//        }
+//    }
     
 //    public enum UploadQuantity {
 //        UPLOAD_SINGLE_FILE(0), UPLOAD_MULTIPLE_FILES(1);
@@ -217,19 +217,19 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 //        }
 //    };
 
-    private volatile Looper mServiceLooper;
-    private volatile ServiceHandler mServiceHandler;
+    private Looper mServiceLooper;
+    private ServiceHandler mServiceHandler;
     //private ExecutorService mUploadExecutor;
 
     private IBinder mBinder;
     private OwnCloudClient mUploadClient = null;
-    private Account mCurrentAccount = null; // LastAccount in FileUploadService
+    private Account mCurrentAccount = null;
     private FileDataStorageManager mStorageManager;
     //since there can be only one instance of an Android service, there also just one db connection.
     private UploadsStorageManager mUploadsStorageManager = null;
     
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
-    private final AtomicBoolean mCancellationPossible = new AtomicBoolean(false);
+    //private final AtomicBoolean mCancellationPossible = new AtomicBoolean(false);
 
     /**
      * List of uploads that are currently pending. Maps from remotePath to where file
@@ -251,31 +251,8 @@ public class FileUploadService extends Service implements OnDatatransferProgress
     private static final String MIME_TYPE_PDF = "application/pdf";
     private static final String FILE_EXTENSION_PDF = ".pdf";
 
-    public FileUploadService() {
-        super();
-    }
-
     public static String getUploadFinishMessage() {
-        return FileUploadService.class.getName().toString() + UPLOAD_FINISH_MESSAGE;
-    }
-
-    /**
-     * Builds a key for mPendingUploads from the account and file to upload
-     * 
-     * @param account Account where the file to upload is stored
-     * @param file File to upload
-     */
-    private String buildRemoteName(Account account, OCFile file) {
-        return account.name + file.getRemotePath();
-    }
-
-    
-    private String buildRemoteName(Account account, String remotePath) {
-        return account.name + remotePath;
-    }
-
-    private String buildRemoteName(OCUpload OCUpload) {
-        return OCUpload.getAccountName() + OCUpload.getRemotePath();
+        return FileUploadService.class.getName() + UPLOAD_FINISH_MESSAGE;
     }
 
     /**
@@ -319,8 +296,8 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 
        // mUploadExecutor = Executors.newFixedThreadPool(1);
 
-        Log_OC.d(TAG, "FileUploadService.retry() called by onCreate()");
-        FileUploadService.retry(getApplicationContext());
+//        Log_OC.d(TAG, "FileUploadService.retry() called by onCreate()");
+//        FileUploadService.retry(getApplicationContext());
 
         AccountManager am = AccountManager.get(getApplicationContext());
         am.addOnAccountsUpdatedListener(this, null, false);
@@ -425,7 +402,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
         boolean isCreateRemoteFolder = intent.getBooleanExtra(KEY_CREATE_REMOTE_FOLDER, false);
         boolean isUseWifiOnly = intent.getBooleanExtra(KEY_WIFI_ONLY, true);
         boolean isWhileChargingOnly = intent.getBooleanExtra(KEY_WHILE_CHARGING_ONLY, false);
-        long uploadTimestamp = intent.getLongExtra(KEY_UPLOAD_TIMESTAMP, -1);
+        //long uploadTimestamp = intent.getLongExtra(KEY_UPLOAD_TIMESTAMP, -1);
 
 
         if (intent.hasExtra(KEY_FILE) && files == null) {
@@ -476,7 +453,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
                         chunked,
                         //isInstant,
                         forceOverwrite,
-                        FileUploadService.LocalBehaviour.values()[localAction], // Change for compilation
+                        localAction, // Change for compilation
                         getApplicationContext()
                 );
                 if (isInstant) {
@@ -495,11 +472,11 @@ public class FileUploadService extends Service implements OnDatatransferProgress
                     ocUpload.setAccountName(account.name);
                     ocUpload.setForceOverwrite(forceOverwrite);
                     ocUpload.setCreateRemoteFolder(isCreateRemoteFolder);
-                    ocUpload.setLocalAction(LocalBehaviour.fromValue(localAction));
+                    ocUpload.setLocalAction(localAction);
                     ocUpload.setUseWifiOnly(isUseWifiOnly);
                     ocUpload.setWhileChargingOnly(isWhileChargingOnly);
-                    ocUpload.setUploadTimestamp(uploadTimestamp);
-                    ocUpload.setUploadStatus(UploadStatus.UPLOAD_IN_PROGRESS);
+//                    ocUpload.setUploadTimestamp(uploadTimestamp);
+                    ocUpload.setUploadStatus(UploadStatus.UPLOAD_LATER);
 
                     // storagePath inside upload is the temporary path. file
                     // contains the correct path used as db reference.
@@ -577,12 +554,12 @@ public class FileUploadService extends Service implements OnDatatransferProgress
          */
         private Map<String, OnDatatransferProgressListener> mBoundListeners = new HashMap<String, OnDatatransferProgressListener>();
 
-        /**
-         * Returns ongoing upload operation. May be null.
-         */
-        public UploadFileOperation getCurrentUploadOperation() {
-            return mCurrentUpload;
-        }
+//        /**
+//         * Returns ongoing upload operation. May be null.
+//         */
+//        public UploadFileOperation getCurrentUploadOperation() {
+//            return mCurrentUpload;
+//        }
 
         /**
          * Cancels a pending or current upload of a remote file.
@@ -591,44 +568,39 @@ public class FileUploadService extends Service implements OnDatatransferProgress
          * @param file      A file in the queue of pending uploads
          */
         public void cancel(Account account, OCFile file) {
-            // From FileUploader
+            // TODO: Remove this comment, when ending the implementation of reliable_uploads
+            // From FileUploader && FileUploaderService
             Pair<UploadFileOperation, String> removeResult = mPendingUploads.remove(account, file.getRemotePath());
             UploadFileOperation upload = removeResult.first;
             if (upload != null) {
                 upload.cancel();
             } else {
-                if (mCurrentUpload != null && mCurrentAccount != null &&
+                // 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 && mCurrentUpload.isUploadInProgress() &&
                         mCurrentUpload.getRemotePath().startsWith(file.getRemotePath()) &&
-                        account.name.equals(mCurrentAccount.name)) {
+                        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];
+                    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);
                 }
             }
-
-            // From FileUploadService
-            // 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 && mCurrentUpload.isUploadInProgress()) {
-                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];
-                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);
-            }
-
         }
 
         /**
@@ -663,16 +635,16 @@ public class FileUploadService extends Service implements OnDatatransferProgress
             }
         }
 
-        // TODO: Review: Method from FileUploadService with some changes because the merge with FileUploader
-        // TODO Complete operation to retry the upload
-        /**
-         * Puts upload in upload list and tell FileUploadService to upload items in list.
-         */
-        public void retry(Account account, OCUpload upload) {
-            String uploadKey = buildRemoteName(upload);
-            //mPendingUploads.put(uploadKey, upload);
-            FileUploadService.retry(getApplicationContext(), uploadKey);
-        }
+//        // TODO: Review: Method from FileUploadService with some changes because the merge with FileUploader
+//        // TODO Complete operation to retry the upload
+//        /**
+//         * Puts upload in upload list and tell FileUploadService to upload items in list.
+//         */
+//        public void retry(Account account, OCUpload upload) {
+//            String uploadKey = buildRemoteName(upload);
+//            //mPendingUploads.put(uploadKey, upload);
+//            FileUploadService.retry(getApplicationContext(), uploadKey);
+//        }
 
         public void clearListeners() {
             mBoundListeners.clear();
@@ -773,6 +745,19 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 //            }
         }
 
+        /**
+         * Builds a key for the map of listeners.
+         *
+         * TODO remove and replace key with file.getFileId() after changing current policy (upload file, then
+         * 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
+         */
+        private String buildRemoteName(Account account, OCFile file) {
+            return account.name + file.getRemotePath();
+        }
 
     }
 
@@ -827,10 +812,14 @@ public class FileUploadService extends Service implements OnDatatransferProgress
             if (AccountUtils.exists(mCurrentUpload.getAccount(), getApplicationContext())) {
                 Log_OC.d(TAG, "Account " + mCurrentUpload.getAccount().name + " exists");
 
+                mCurrentUpload.addDatatransferProgressListener((FileUploaderBinder) mBinder);
+                mCurrentUpload.addDatatransferProgressListener(this);
+
                 notifyUploadStart(mCurrentUpload);
 
                 RemoteOperationResult uploadResult = null, grantResult;
 
+
                 try {
                     /// prepare client object to send the request to the ownCloud server
                     if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentUpload.getAccount())) {
@@ -1043,40 +1032,6 @@ public class FileUploadService extends Service implements OnDatatransferProgress
         return result;
     }
 
-    // TODO: Replaced by grantFolderExistence(String pathToGrant
-//    /**
-//     * Checks the existence of the folder where the current file will be
-//     * uploaded both in the remote server and in the local database.
-//     *
-//     * If the upload is set to enforce the creation of the folder, the method
-//     * tries to create it both remote and locally.
-//     *
-//     * @param pathToGrant Full remote path whose existence will be granted.
-//     * @return An {@link OCFile} instance corresponding to the folder where the
-//     *         file will be uploaded.
-//     */
-//    private RemoteOperationResult grantFolderExistence(UploadFileOperation currentUpload, String pathToGrant) {
-//        RemoteOperation operation = new ExistenceCheckRemoteOperation(pathToGrant, this, false);
-//        RemoteOperationResult result = operation.execute(mUploadClient);
-//        if (!result.isSuccess() && result.getCode() == ResultCode.FILE_NOT_FOUND
-//                && currentUpload.isRemoteFolderToBeCreated()) {
-//            SyncOperation syncOp = new CreateFolderOperation(pathToGrant, true);
-//            result = syncOp.execute(mUploadClient, mStorageManager);
-//        }
-//        if (result.isSuccess()) {
-//            OCFile parentDir = mStorageManager.getFileByPath(pathToGrant);
-//            if (parentDir == null) {
-//                parentDir = createLocalFolder(pathToGrant);
-//            }
-//            if (parentDir != null) {
-//                result = new RemoteOperationResult(ResultCode.OK);
-//            } else {
-//                result = new RemoteOperationResult(ResultCode.UNKNOWN_ERROR);
-//            }
-//        }
-//        return result;
-//    }
-
     private OCFile createLocalFolder(String remotePath) {
         String parentPath = new File(remotePath).getParent();
         parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ?
@@ -1218,7 +1173,6 @@ public class FileUploadService extends Service implements OnDatatransferProgress
         Intent showUploadListIntent = new Intent(this, UploadListActivity.class);
         showUploadListIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile());
         showUploadListIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount());
-        showUploadListIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         showUploadListIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         mNotificationBuilder.setContentIntent(PendingIntent.getActivity(this, (int) System.currentTimeMillis(),
                 showUploadListIntent, 0));
@@ -1314,7 +1268,6 @@ public class FileUploadService extends Service implements OnDatatransferProgress
                 updateAccountCredentials.putExtra(
                         AuthenticatorActivity.EXTRA_ACTION,
                         AuthenticatorActivity.ACTION_UPDATE_EXPIRED_TOKEN);
-                updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
                 updateAccountCredentials.addFlags(Intent.FLAG_FROM_BACKGROUND);
                 mNotificationBuilder.setContentIntent(PendingIntent.getActivity(
@@ -1362,6 +1315,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
                 Intent showUploadListIntent = new Intent(this, UploadListActivity.class);
                 showUploadListIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile());
                 showUploadListIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount());
+                showUploadListIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 mNotificationBuilder.setContentIntent(PendingIntent.getActivity(this, (int) System.currentTimeMillis(),
                         showUploadListIntent, 0));
             }
@@ -1466,6 +1420,8 @@ public class FileUploadService extends Service implements OnDatatransferProgress
             end.putExtra(EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath);
         }
 
+        updateDatabaseUploadResult(uploadResult, mCurrentUpload);
+
         sendStickyBroadcast(end);
     }
 
@@ -1498,6 +1454,8 @@ public class FileUploadService extends Service implements OnDatatransferProgress
      * @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) {
@@ -1914,24 +1872,24 @@ public class FileUploadService extends Service implements OnDatatransferProgress
         return CanUploadFileNowStatus.NOW;        
     }
 
-    /**
-     * Call if all pending uploads are to be retried.
-     */
-    public static void retry(Context context) {
-        retry(context, null);    
-    }
+//    /**
+//     * Call if all pending uploads are to be retried.
+//     */
+//    public static void retry(Context context) {
+//        retry(context, null);
+//    }
 
-    /**
-     * Call to retry upload identified by remotePath
-     */
-    private static void retry(Context context, String remotePath) {
-        Log_OC.d(TAG, "FileUploadService.retry()");
-        Intent i = new Intent(context, FileUploadService.class);
-        i.putExtra(FileUploadService.KEY_RETRY, true);
-        if(remotePath != null) {
-            i.putExtra(FileUploadService.KEY_RETRY_REMOTE_PATH, remotePath);
-        }
-        context.startService(i);        
-    }
+//    /**
+//     * Call to retry upload identified by remotePath
+//     */
+//    private static void retry(Context context, String remotePath) {
+//        Log_OC.d(TAG, "FileUploadService.retry()");
+//        Intent i = new Intent(context, FileUploadService.class);
+//        i.putExtra(FileUploadService.KEY_RETRY, true);
+//        if(remotePath != null) {
+//            i.putExtra(FileUploadService.KEY_RETRY_REMOTE_PATH, remotePath);
+//        }
+//        context.startService(i);
+//    }
 
 }

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

@@ -20,13 +20,6 @@
 
 package com.owncloud.android.files.services;
 
-import java.io.File;
-import java.util.AbstractList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
@@ -74,6 +67,13 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.UriUtils;
 
+import java.io.File;
+import java.util.AbstractList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
 
 public class FileUploader extends Service
         implements OnDatatransferProgressListener, OnAccountsUpdateListener {
@@ -289,7 +289,7 @@ public class FileUploader extends Service
                         chunked,
                         //isInstant,
                         forceOverwrite,
-                        FileUploadService.LocalBehaviour.values()[localAction], // Change for compilation
+                        localAction, // Change for compilation
                         getApplicationContext()
                 );
                 if (isInstant) {

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

@@ -28,7 +28,6 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploadService;
-import com.owncloud.android.files.services.FileUploadService.LocalBehaviour;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
@@ -80,7 +79,7 @@ public class UploadFileOperation extends RemoteOperation {
     private boolean mChunked = false;
     private boolean mRemoteFolderToBeCreated = false;
     private boolean mForceOverwrite = false;
-    private LocalBehaviour mLocalBehaviour = FileUploadService.LocalBehaviour.LOCAL_BEHAVIOUR_COPY;
+    private int mLocalBehaviour = FileUploadService.LOCAL_BEHAVIOUR_COPY;
     private boolean mWasRenamed = false;
     private String mOriginalFileName = null;
     /**
@@ -102,7 +101,7 @@ public class UploadFileOperation extends RemoteOperation {
                                 OCFile file,
                                 boolean chunked,
                                 boolean forceOverwrite,
-                                LocalBehaviour localBehaviour, 
+                                int localBehaviour,
                                 Context context) {
         if (account == null)
             throw new IllegalArgumentException("Illegal NULL account in UploadFileOperation " +
@@ -238,7 +237,7 @@ public class UploadFileOperation extends RemoteOperation {
             // check location of local file; if not the expected, copy to a
             // temporal file before upload (if COPY is the expected behaviour)
             if (!mOriginalStoragePath.equals(expectedPath) &&
-                    mLocalBehaviour == FileUploadService.LocalBehaviour.LOCAL_BEHAVIOUR_COPY) {
+                    mLocalBehaviour == FileUploadService.LOCAL_BEHAVIOUR_COPY) {
 
 
                 if (FileStorageUtils.getUsableSpace(mAccount.name) < originalFile.length()) {
@@ -361,7 +360,7 @@ public class UploadFileOperation extends RemoteOperation {
             /// move local temporal file or original file to its corresponding
             // location in the ownCloud local folder
             if (result.isSuccess()) {
-                if (mLocalBehaviour == FileUploadService.LocalBehaviour.LOCAL_BEHAVIOUR_FORGET) {
+                if (mLocalBehaviour == FileUploadService.LOCAL_BEHAVIOUR_FORGET) {
                     mFile.setStoragePath("");
                 } else {
                     mFile.setStoragePath(expectedPath);

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

@@ -24,7 +24,6 @@ package com.owncloud.android.ui.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Parcelable;
 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
@@ -61,7 +60,7 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
                 i.putExtra(FileUploadService.KEY_FORCE_OVERWRITE, true);
                 break;
             case KEEP_BOTH:
-                i.putExtra(FileUploadService.KEY_LOCAL_BEHAVIOUR, FileUploadService.LocalBehaviour.LOCAL_BEHAVIOUR_MOVE);
+                i.putExtra(FileUploadService.KEY_LOCAL_BEHAVIOUR, FileUploadService.LOCAL_BEHAVIOUR_MOVE);
                 break;
             case SERVER:
                 // use server version -> delete local, request download

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

@@ -689,7 +689,7 @@ public class FileDisplayActivity extends HookActivity implements
             i.putExtra(FileUploadService.KEY_UPLOAD_TYPE,
                     FileUploadService.UPLOAD_MULTIPLE_FILES);
             if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)
-                i.putExtra(FileUploadService.KEY_LOCAL_BEHAVIOUR, FileUploadService.LocalBehaviour.LOCAL_BEHAVIOUR_MOVE);
+                i.putExtra(FileUploadService.KEY_LOCAL_BEHAVIOUR, FileUploadService.LOCAL_BEHAVIOUR_MOVE);
             startService(i);
 
         } else {
@@ -770,7 +770,7 @@ public class FileDisplayActivity extends HookActivity implements
                 FileUploadService.UPLOAD_SINGLE_FILE);
         if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE) {
             i.putExtra(FileUploadService.KEY_LOCAL_BEHAVIOUR,
-                    FileUploadService.LocalBehaviour.LOCAL_BEHAVIOUR_MOVE);
+                    FileUploadService.LOCAL_BEHAVIOUR_MOVE);
         }
         if(startService(i) == null) {
             Log_OC.e(TAG, "FileUploadService could not be started");

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

@@ -148,10 +148,10 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
                     mDrawerLayout.openDrawer(GravityCompat.START);
                 }
                 break;
-            case R.id.action_retry_uploads:
-                Log_OC.d(TAG, "FileUploadService.retry() called by onMenuItemSelected()");
-                FileUploadService.retry(this);
-                break;
+//            case R.id.action_retry_uploads:
+//                Log_OC.d(TAG, "FileUploadService.retry() called by onMenuItemSelected()");
+//                FileUploadService.retry(this);
+//                break;
 
             case R.id.action_clear_failed_uploads:
                 UploadsStorageManager usm = new UploadsStorageManager(getContentResolver());
@@ -212,6 +212,10 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
                 mUploaderBinder = null;
             }
         }
-    };  
+    };
+
+    public void addBinderToItem(){
+
+    }
 
 }

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

@@ -190,16 +190,19 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                     progressBar.setVisibility(View.VISIBLE);
                     mProgressListener = new ProgressListener(progressBar);
                     if(mParentActivity.getFileUploaderBinder() != null) {
-                        mCurrentUpload = mParentActivity.getFileUploaderBinder().getCurrentUploadOperation();
-                        if(mCurrentUpload != null) {
-                            mCurrentUpload.addDatatransferProgressListener(mProgressListener);
-                            Log_OC.d(TAG, "added progress listener for current upload: " + mCurrentUpload);
-                        } else {
-                            Log_OC.w(TAG, "getFileUploaderBinder().getCurrentUploadOperation() return null. That is odd.");
-                        }
+                        mParentActivity.getFileUploaderBinder().addDatatransferProgressListener(mProgressListener,
+                                mParentActivity.getAccount(), upload.getOCFile());
+//                        mCurrentUpload = mParentActivity.getFileUploaderBinder().getCurrentUploadOperation();
+//                        if(mCurrentUpload != null) {
+//                            mCurrentUpload.addDatatransferProgressListener(mProgressListener);
+//                            Log_OC.d(TAG, "added progress listener for current upload: " + mCurrentUpload);
+//                        } else {
+//                            Log_OC.w(TAG, "getFileUploaderBinder().getCurrentUploadOperation() return null. That is odd.");
+//                        }
                     } else {
                         Log_OC.e(TAG, "UploadBinder == null. It should have been created on creating mParentActivity"
                                 + " which inherits from FileActivity. Fix that!");
+                        Log_OC.e(TAG, "PENDING BINDING for upload = " + upload.getLocalPath());
                     }
                     break;
                 case UPLOAD_FAILED_GIVE_UP:
@@ -263,7 +266,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                 rightButton.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        mParentActivity.getFileOperationsHelper().retryUpload(upload);
+                   //     mParentActivity.getFileOperationsHelper().retryUpload(upload);
                     }
                 });
             } else if (upload.userCanCancelUpload()) {

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

@@ -24,9 +24,6 @@
 package com.owncloud.android.ui.adapter;
 
 
-import java.io.File;
-import java.util.Vector;
-
 import android.accounts.Account;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -57,6 +54,8 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
 
+import java.util.Vector;
+
 
 /**
  * This Adapter populates a ListView with all files and folders in an ownCloud

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

@@ -151,9 +151,9 @@ public class UploadListFragment extends ExpandableListFragment {
         case R.id.action_remove_upload: {
             ((FileActivity) getActivity()).getFileOperationsHelper().removeUploadFromList(uploadFile);
             return true;
-        }case R.id.action_retry_upload: {
-            ((FileActivity) getActivity()).getFileOperationsHelper().retryUpload(uploadFile);
-            return true;
+//        }case R.id.action_retry_upload: {
+//            ((FileActivity) getActivity()).getFileOperationsHelper().retryUpload(uploadFile);
+//            return true;
         }case R.id.action_see_details: {
             Intent showDetailsIntent = new Intent(getActivity(), FileDisplayActivity.class);
             showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, (Parcelable) uploadFile.getOCFile());