Browse Source

Refresh listview when clear failed/finished uploads clicked

Juan Carlos González Cabrero 9 years ago
parent
commit
9fe62d15ea

+ 6 - 3
res/menu/upload_list_menu.xml

@@ -21,11 +21,14 @@
 
 
     <item
     <item
         android:id="@+id/action_retry_uploads"
         android:id="@+id/action_retry_uploads"
-        android:title="Retry current uploads"/>
+        android:title="@string/action_retry_uploads"/>
     <item
     <item
         android:id="@+id/action_clear_failed_uploads"
         android:id="@+id/action_clear_failed_uploads"
-        android:title="Clear failed uploads"/>
+        android:title="@string/action_clear_failed_uploads"/>
     <item
     <item
         android:id="@+id/action_clear_finished_uploads"
         android:id="@+id/action_clear_finished_uploads"
-        android:title="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>
 </menu>

+ 5 - 0
res/values/strings.xml

@@ -426,4 +426,9 @@
 
 
     <string name="action_switch_grid_view">Switch to grid view</string>
     <string name="action_switch_grid_view">Switch to grid view</string>
     <string name="action_switch_list_view">Switch to list view</string>
     <string name="action_switch_list_view">Switch to list view</string>
+
+    <string name="action_retry_uploads">Retry current 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>
 </resources>
 </resources>

+ 13 - 3
src/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -186,6 +186,10 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
     @Override
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
         boolean retval = true;
+        UploadsStorageManager storageManager = null;
+        UploadListFragment uploadListFragment =
+                (UploadListFragment) getSupportFragmentManager().findFragmentByTag(TAG_UPLOAD_LIST_FRAGMENT);
+
         switch (item.getItemId()) {
         switch (item.getItemId()) {
             case android.R.id.home:
             case android.R.id.home:
                 if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
                 if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
@@ -200,13 +204,19 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
 //                break;
 //                break;
 
 
             case R.id.action_clear_failed_uploads:
             case R.id.action_clear_failed_uploads:
-                UploadsStorageManager usm = new UploadsStorageManager(getContentResolver());
-                usm.clearFailedUploads();
+                storageManager = new UploadsStorageManager(getContentResolver());
+                storageManager.clearFailedUploads();
+                uploadListFragment.updateUploads();
                 break;
                 break;
 
 
             case R.id.action_clear_finished_uploads:
             case R.id.action_clear_finished_uploads:
-                UploadsStorageManager storageManager = new UploadsStorageManager(getContentResolver());
+                storageManager = new UploadsStorageManager(getContentResolver());
                 storageManager.clearFinishedUploads();
                 storageManager.clearFinishedUploads();
+                uploadListFragment.updateUploads();
+                break;
+
+            case R.id.action_clear_all_uploads:
+                // IMPLEMENTATION PENDING
                 break;
                 break;
 
 
             default:
             default: