Refactor clear options for uploads avoiding clear the current ones

res/menu/upload_list_menu.xml

@@ -25,10 +25,10 @@
     <item
         android:id="@+id/action_clear_failed_uploads"
         android:title="@string/action_clear_failed_uploads"/>
+    <item
+        android:id="@+id/action_clear_successfull_uploads"
+        android:title="@string/action_clear_successful_uploads"/>
     <item
         android:id="@+id/action_clear_finished_uploads"
         android:title="@string/action_clear_finished_uploads"/>
-    <item
-        android:id="@+id/action_clear_all_uploads"
-        android:title="@string/action_clear_all_uploads"/>
 </menu>

res/values/strings.xml

@@ -426,10 +426,10 @@
     <string name="edit_share_unshare">Stop sharing</string>
     <string name="edit_share_done">done</string>
 
-    <string name="action_retry_uploads">Retry failed uploads</string>
-    <string name="action_clear_failed_uploads">Clear failed uploads</string>
-    <string name="action_clear_finished_uploads">Clear finished uploads</string>
-    <string name="action_clear_all_uploads">Clear all uploads</string>
+    <string name="action_retry_uploads">Retry failed</string>
+    <string name="action_clear_failed_uploads">Clear failed</string>
+    <string name="action_clear_successful_uploads">Clear successful</string>
+    <string name="action_clear_finished_uploads">Clear all finished</string>
 
     <string name="action_switch_grid_view">Grid view</string>
     <string name="action_switch_list_view">List view</string>

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

@@ -454,30 +454,28 @@ public class UploadsStorageManager extends Observable {
         return result;
     }
 
-    public long clearFinishedUploads() {
+    public long clearSuccessfulUploads() {
         long result = getDB().delete(
                 ProviderTableMeta.CONTENT_URI_UPLOADS,
                 ProviderTableMeta.UPLOADS_STATUS + "=="+ UploadStatus.UPLOAD_SUCCEEDED.value, null
         );
-        Log_OC.d(TAG, "delete all finished uploads");
+        Log_OC.d(TAG, "delete all successful uploads");
         if (result > 0) {
             notifyObserversNow();
         }
         return result;
     }
 
-    public long clearAllUploads() {
-        String[] whereArgs = new String[3];
+    public long clearAllFinishedUploads() {
+        String[] whereArgs = new String[2];
         whereArgs[0] = String.valueOf(UploadStatus.UPLOAD_SUCCEEDED.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 + "=?",
+                ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=?",
                 whereArgs
         );
-        Log_OC.d(TAG, "delete all uploads");
+        Log_OC.d(TAG, "delete all finished uploads");
         if (result > 0) {
             notifyObserversNow();
         }

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

@@ -203,15 +203,15 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
                 uploadListFragment.updateUploads();
                 break;
 
-            case R.id.action_clear_finished_uploads:
+            case R.id.action_clear_successfull_uploads:
                 storageManager = new UploadsStorageManager(getContentResolver());
-                storageManager.clearFinishedUploads();
+                storageManager.clearSuccessfulUploads();
                 uploadListFragment.updateUploads();
                 break;
 
-            case R.id.action_clear_all_uploads:
+            case R.id.action_clear_finished_uploads:
                 storageManager = new UploadsStorageManager(getContentResolver());
-                storageManager.clearAllUploads();
+                storageManager.clearAllFinishedUploads();
                 uploadListFragment.updateUploads();
                 break;