Просмотр исходного кода

Prevent several rescans in a row

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 8 лет назад
Родитель
Сommit
f66cda8d73
1 измененных файлов с 12 добавлено и 0 удалено
  1. 12 0
      src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

+ 12 - 0
src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -78,6 +78,8 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
 
 
     private UploadMessagesReceiver mUploadMessagesReceiver;
     private UploadMessagesReceiver mUploadMessagesReceiver;
 
 
+    private Menu mMenu;
+
     @Override
     @Override
     public void showFiles(boolean onDeviceOnly) {
     public void showFiles(boolean onDeviceOnly) {
         super.showFiles(onDeviceOnly);
         super.showFiles(onDeviceOnly);
@@ -218,6 +220,9 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
             case R.id.action_retry_uploads:
             case R.id.action_retry_uploads:
                 FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
                 FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
                 requester.retryFailedUploads(this, null, null);
                 requester.retryFailedUploads(this, null, null);
+                if (mMenu != null) {
+                    mMenu.removeItem(R.id.action_retry_uploads);
+                }
                 break;
                 break;
 
 
             case R.id.action_clear_failed_uploads:
             case R.id.action_clear_failed_uploads:
@@ -244,6 +249,11 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
                         .setUpdateCurrent(false)
                         .setUpdateCurrent(false)
                         .build()
                         .build()
                         .schedule();
                         .schedule();
+                
+                if (mMenu != null) {
+                    mMenu.removeItem(R.id.action_force_rescan);
+                }
+
                 break;
                 break;
 
 
             default:
             default:
@@ -260,7 +270,9 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         if (appPrefs.getBoolean("expert_mode", false)) {
         if (appPrefs.getBoolean("expert_mode", false)) {
             MenuInflater inflater = getMenuInflater();
             MenuInflater inflater = getMenuInflater();
             inflater.inflate(R.menu.upload_list_menu, menu);
             inflater.inflate(R.menu.upload_list_menu, menu);
+            mMenu = menu;
         }
         }
+
         return true;
         return true;
     }
     }