Refactorized UploadStatus to have only 3 types of Status

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

@@ -32,8 +32,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.operations.UploadFileOperation;
 
-import java.io.File;
-import java.security.Provider;
 import java.util.Observable;
 
 /**
@@ -47,34 +45,22 @@ public class UploadsStorageManager extends Observable {
     static private final String TAG = UploadsStorageManager.class.getSimpleName();
 
     public enum UploadStatus {
+
         /**
-         * Upload scheduled.
-         */
-        UPLOAD_LATER(0),
-        /**
-         * Last upload failed. Will retry.
-         */
-        UPLOAD_FAILED_RETRY(1),
-        /**
-         * Upload currently in progress.
+         * Upload currently in progress or scheduled to be executed.
          */
-        UPLOAD_IN_PROGRESS(2),
+        UPLOAD_IN_PROGRESS(0),
+
         /**
-         * Upload paused. Has to be manually resumed by user.
+         * Last upload failed.
          */
-        UPLOAD_PAUSED(3),
+        UPLOAD_FAILED(1),
+
         /**
          * Upload was successful.
          */
-        UPLOAD_SUCCEEDED(4),
-        /**
-         * Upload failed with some severe reason. Do not retry.
-         */
-        UPLOAD_FAILED_GIVE_UP(5),
-        /**
-         * User has cancelled upload. Do not retry.
-         */
-        UPLOAD_CANCELLED(6);
+        UPLOAD_SUCCEEDED(2);
+
         private final int value;
 
         UploadStatus(int value) {
@@ -88,19 +74,11 @@ public class UploadsStorageManager extends Observable {
         public static UploadStatus fromValue(int value) {
             switch (value) {
                 case 0:
-                    return UPLOAD_LATER;
+                    return UPLOAD_IN_PROGRESS;
                 case 1:
-                    return UPLOAD_FAILED_RETRY;
+                    return UPLOAD_FAILED;
                 case 2:
-                    return UPLOAD_IN_PROGRESS;
-                case 3:
-                    return UPLOAD_PAUSED;
-                case 4:
                     return UPLOAD_SUCCEEDED;
-                case 5:
-                    return UPLOAD_FAILED_GIVE_UP;
-                case 6:
-                    return UPLOAD_CANCELLED;
             }
             return null;
         }
@@ -466,18 +444,6 @@ public class UploadsStorageManager extends Observable {
         return upload;
     }
 
-    /**
-     * Get all uploads which are pending, i.e., queued for upload but not
-     * currently being uploaded
-     *
-     * @return
-     */
-    public OCUpload[] getPendingUploads() {
-        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_LATER.value + " OR " +
-                        ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED_RETRY.value,
-                null);
-    }
-
     /**
      * Get all uploads which are currently being uploaded. There should only be
      * one. No guarantee though.
@@ -490,10 +456,7 @@ public class UploadsStorageManager extends Observable {
      * Get all current and pending uploads.
      */
     public OCUpload[] getCurrentAndPendingUploads() {
-        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value + " OR " +
-                ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_LATER.value + " OR " +
-                ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED_RETRY.value + " OR " +
-                ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_PAUSED.value, null);
+        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value, null);
     }
 
     /**
@@ -501,8 +464,7 @@ public class UploadsStorageManager extends Observable {
      * retried.
      */
     public OCUpload[] getFailedUploads() {
-        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED_GIVE_UP.value + " OR " +
-                ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_CANCELLED.value, null);
+        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value, null);
     }
 
     /**
@@ -517,13 +479,9 @@ public class UploadsStorageManager extends Observable {
     }
 
     public long clearFailedUploads() {
-        String[] whereArgs = new String[2];
-        whereArgs[0] = String.valueOf(UploadStatus.UPLOAD_CANCELLED.value);
-        whereArgs[1] = String.valueOf(UploadStatus.UPLOAD_FAILED_GIVE_UP.value);
         long result = getDB().delete(
                 ProviderTableMeta.CONTENT_URI_UPLOADS,
-                ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=?",
-                whereArgs
+                ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value, null
         );
         Log_OC.d(TAG, "delete all failed uploads");
         if (result > 0) {
@@ -533,12 +491,9 @@ public class UploadsStorageManager extends Observable {
     }
 
     public long clearFinishedUploads() {
-        String[] whereArgs = new String[1];
-        whereArgs[0] = String.valueOf(UploadStatus.UPLOAD_SUCCEEDED.value);
         long result = getDB().delete(
                 ProviderTableMeta.CONTENT_URI_UPLOADS,
-                ProviderTableMeta.UPLOADS_STATUS + "=? ",
-                whereArgs
+                ProviderTableMeta.UPLOADS_STATUS + "=="+ UploadStatus.UPLOAD_SUCCEEDED.value, null
         );
         Log_OC.d(TAG, "delete all finished uploads");
         if (result > 0) {
@@ -548,18 +503,14 @@ public class UploadsStorageManager extends Observable {
     }
 
     public long clearAllUploads() {
-        String[] whereArgs = new String[6];
+        String[] whereArgs = new String[3];
         whereArgs[0] = String.valueOf(UploadStatus.UPLOAD_SUCCEEDED.value);
-        whereArgs[1] = String.valueOf(UploadStatus.UPLOAD_CANCELLED.value);
-        whereArgs[2] = String.valueOf(UploadStatus.UPLOAD_FAILED_GIVE_UP.value);
-        whereArgs[3] = String.valueOf(UploadStatus.UPLOAD_FAILED_RETRY.value);
-        whereArgs[4] = String.valueOf(UploadStatus.UPLOAD_PAUSED.value);
-        whereArgs[5] = String.valueOf(UploadStatus.UPLOAD_IN_PROGRESS.value);
+        whereArgs[1] = String.valueOf(UploadStatus.UPLOAD_FAILED.value);
+        whereArgs[2] = String.valueOf(UploadStatus.UPLOAD_IN_PROGRESS.value);
         long result = getDB().delete(
                 ProviderTableMeta.CONTENT_URI_UPLOADS,
                 ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=? OR " +
-                        ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=? OR " +
-                        ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=?",
+                        ProviderTableMeta.UPLOADS_STATUS + "=?",
                 whereArgs
         );
         Log_OC.d(TAG, "delete all uploads");
@@ -569,18 +520,18 @@ public class UploadsStorageManager extends Observable {
         return result;
     }
 
-    public void setAllCurrentToUploadLater() {
-        Cursor c = getDB().query(
-                ProviderTableMeta.CONTENT_URI_UPLOADS,
-                null,
-                ProviderTableMeta.UPLOADS_STATUS + "=? ",
-                new String[]{
-                        Integer.toString(UploadStatus.UPLOAD_IN_PROGRESS.value)
-                },
-                null
-        );
-        updateUploadInternal(c, UploadStatus.UPLOAD_LATER, UploadResult.UNKNOWN);
-    }
+//    public void setAllCurrentToUploadLater() {
+//        Cursor c = getDB().query(
+//                ProviderTableMeta.CONTENT_URI_UPLOADS,
+//                null,
+//                ProviderTableMeta.UPLOADS_STATUS + "=? ",
+//                new String[]{
+//                        Integer.toString(UploadStatus.UPLOAD_IN_PROGRESS.value)
+//                },
+//                null
+//        );
+//        updateUploadInternal(c, UploadStatus.UPLOAD_LATER, UploadResult.UNKNOWN);
+//    }
 
 
     /**
@@ -592,7 +543,7 @@ public class UploadsStorageManager extends Observable {
         if (uploadResult.isCancelled()) {
             updateUploadStatus(
                     upload.getOCUploadId(),
-                    UploadStatus.UPLOAD_CANCELLED,
+                    UploadStatus.UPLOAD_FAILED,
                     UploadResult.CANCELLED
             );
         } else {
@@ -607,11 +558,11 @@ public class UploadsStorageManager extends Observable {
                 // TODO: Disable for testing of menu actions in uploads view
                 if (shouldRetryFailedUpload(uploadResult)) {
                     updateUploadStatus(
-                            upload.getOCUploadId(), UploadStatus.UPLOAD_FAILED_RETRY,
+                            upload.getOCUploadId(), UploadStatus.UPLOAD_FAILED,
                             UploadResult.fromOperationResult(uploadResult));
                 } else {
                     updateUploadStatus(upload.getOCUploadId(),
-                            UploadsStorageManager.UploadStatus.UPLOAD_FAILED_GIVE_UP,
+                            UploadsStorageManager.UploadStatus.UPLOAD_FAILED,
                             UploadResult.fromOperationResult(uploadResult));
                 }
             }

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

@@ -155,7 +155,7 @@ public class OCUpload implements Parcelable {
         mIsCreateRemoteFolder = false;
         mIsUseWifiOnly = true;
         mIsWhileChargingOnly = false;
-        mUploadStatus = UploadStatus.UPLOAD_LATER;
+        mUploadStatus = UploadStatus.UPLOAD_IN_PROGRESS;
         mLastResult = UploadResult.UNKNOWN;
         mCreatedBy = UploadFileOperation.CREATED_BY_USER;
     }
@@ -340,30 +340,21 @@ public class OCUpload implements Parcelable {
      * upload is currently in progress or scheduled for upload.
      */
     public  boolean userCanCancelUpload() {
-        switch (this.getUploadStatus()) {
-            case UPLOAD_IN_PROGRESS:
-            case UPLOAD_LATER:
-                return true;
-            default:
-                return false;
+        if (getUploadStatus() == UploadStatus.UPLOAD_IN_PROGRESS) {
+            return true;
         }
+        return false;
     }
 
     /**
      * Returns true when user can choose to retry this upload. That is, when
-     * user cancelled upload before or when upload has failed.
+     * upload has failed for any reason.
      */
     public boolean userCanRetryUpload() {
-        switch (this.getUploadStatus()) {
-            case UPLOAD_CANCELLED:
-            case UPLOAD_FAILED_RETRY://automatically retried. no need for user option.
-            case UPLOAD_FAILED_GIVE_UP: //TODO this case needs to be handled as described by
-                // https://github.com/owncloud/android/issues/765#issuecomment-66490312
-            case UPLOAD_LATER: //upload is already schedule but allow user to increase priority
-                return true;
-            default:
-                return false;
+        if (getUploadStatus() == UploadStatus.UPLOAD_FAILED) {
+            return true;
         }
+        return false;
     }
 
 
@@ -405,7 +396,7 @@ public class OCUpload implements Parcelable {
         try {
             mUploadStatus = UploadStatus.valueOf(source.readString());
         } catch (IllegalArgumentException x) {
-            mUploadStatus = UploadStatus.UPLOAD_LATER;
+            mUploadStatus = UploadStatus.UPLOAD_IN_PROGRESS;
         }
         try {
             mLastResult = UploadResult.valueOf(source.readString());
@@ -507,7 +498,7 @@ public class OCUpload implements Parcelable {
         if (reason.length() > 1) {
             return reason.toString();
         }
-        if (getUploadStatus() == UploadStatus.UPLOAD_LATER) {
+        if (getUploadStatus() == UploadStatus.UPLOAD_IN_PROGRESS) {
             return context.getString(R.string.uploads_view_later_waiting_to_upload);
         }
         return null;

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

@@ -508,7 +508,7 @@ public class FileUploader extends Service
                     ocUpload.setLocalAction(localAction);
                     /*ocUpload.setUseWifiOnly(isUseWifiOnly);
                     ocUpload.setWhileChargingOnly(isWhileChargingOnly);*/
-                    ocUpload.setUploadStatus(UploadStatus.UPLOAD_LATER);
+                    ocUpload.setUploadStatus(UploadStatus.UPLOAD_IN_PROGRESS);
 
                     // storagePath inside upload is the temporary path. file
                     // contains the correct path used as db reference.
@@ -572,7 +572,7 @@ public class FileUploader extends Service
                 requestedUploads.add(uploadKey);
 
                 // Update upload in database
-                upload.setUploadStatus(UploadStatus.UPLOAD_LATER);
+                upload.setUploadStatus(UploadStatus.UPLOAD_IN_PROGRESS);
                 mUploadsStorageManager.updateUpload(upload);
             }
         }
@@ -680,7 +680,7 @@ public class FileUploader extends Service
                     OCUpload ocUpload =
                             mUploadsStorageManager.getUploadByLocalPath(localPath)[0];
                     // TODO bad idea, should search for account + remoteName, or uploadId
-                    ocUpload.setUploadStatus(UploadStatus.UPLOAD_CANCELLED);
+                    ocUpload.setUploadStatus(UploadStatus.UPLOAD_FAILED);
                     ocUpload.setLastResult(UploadResult.CANCELLED);
                     mUploadsStorageManager.updateUploadStatus(ocUpload);
                 }

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

@@ -275,7 +275,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                     fileSizeTextView.setVisibility(View.GONE);
                     accountNameTextView.setVisibility(View.INVISIBLE);
                     break;
-                case UPLOAD_FAILED_GIVE_UP:
+                case UPLOAD_FAILED:
                     uploadDateTextView.setVisibility(View.GONE);
                     if (upload.getLastResult() != null) {
                         switch (upload.getLastResult()) {
@@ -313,6 +313,9 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                                 status = mParentActivity.getString(
                                         R.string.uploads_view_upload_status_failed_permission_error);
                                 break;
+                            case NETWORK_CONNECTION:
+                                status = mParentActivity.getString(R.string.uploads_view_upload_status_failed_connection_error);
+                                break;
                             default:
                                 status = mParentActivity.getString(
                                         R.string.uploads_view_upload_status_failed) + ": "
@@ -324,40 +327,40 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                                 R.string.uploads_view_upload_status_failed);
                         ;
                     }
-                    break;
-                case UPLOAD_FAILED_RETRY:
-                    if (upload.getLastResult() == UploadResult.NETWORK_CONNECTION) {
-                        status = mParentActivity.getString(R.string.uploads_view_upload_status_failed_connection_error);
-                    } else {
-                        status = mParentActivity.getString(R.string.uploads_view_upload_status_failed_retry);
-                    }
+
                     String laterReason = upload.getUploadLaterReason(mParentActivity);
                     if (laterReason != null) {
                         //Upload failed once but is delayed now, show reason.
                         status = laterReason;
                     }
-                    pathTextView.setVisibility(View.GONE);
-                    fileSizeTextView.setVisibility(View.GONE);
-                    accountNameTextView.setVisibility(View.INVISIBLE);
-                    uploadDateTextView.setVisibility(View.GONE);
-                    break;
-                case UPLOAD_LATER:
-                    uploadDateTextView.setVisibility(View.GONE);
-                    pathTextView.setVisibility(View.GONE);
-                    fileSizeTextView.setVisibility(View.GONE);
-                    accountNameTextView.setVisibility(View.INVISIBLE);
-                    status = upload.getUploadLaterReason(mParentActivity);
                     break;
+//                case UPLOAD_FAILED:
+//                    if (upload.getLastResult() == UploadResult.NETWORK_CONNECTION) {
+//                        status = mParentActivity.getString(R.string.uploads_view_upload_status_failed_connection_error);
+//                    } else {
+//                        status = mParentActivity.getString(R.string.uploads_view_upload_status_failed_retry);
+//                    }
+//                    String laterReason = upload.getUploadLaterReason(mParentActivity);
+//                    if (laterReason != null) {
+//                        //Upload failed once but is delayed now, show reason.
+//                        status = laterReason;
+//                    }
+//                    pathTextView.setVisibility(View.GONE);
+//                    fileSizeTextView.setVisibility(View.GONE);
+//                    accountNameTextView.setVisibility(View.INVISIBLE);
+//                    uploadDateTextView.setVisibility(View.GONE);
+//                    break;
+//                case UPLOAD_LATER:
+//                    uploadDateTextView.setVisibility(View.GONE);
+//                    pathTextView.setVisibility(View.GONE);
+//                    fileSizeTextView.setVisibility(View.GONE);
+//                    accountNameTextView.setVisibility(View.INVISIBLE);
+//                    status = upload.getUploadLaterReason(mParentActivity);
+//                    break;
                 case UPLOAD_SUCCEEDED:
                     status = mParentActivity.getString(R.string.uploads_view_upload_status_succeeded);
                     statusTextView.setVisibility(View.GONE);
                     break;
-                case UPLOAD_CANCELLED:
-                    status = mParentActivity.getString(R.string.uploads_view_upload_status_cancelled);
-                    break;
-                case UPLOAD_PAUSED:
-                    status = mParentActivity.getString(R.string.uploads_view_upload_status_paused);
-                    break;
                 default:
                     status = upload.getUploadStatus().toString();
                     if (upload.getLastResult() != null) {