Grant that cancellations of tasks generating thumbnails really works for reused icon...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / RemoveFileDialogFragment.java

diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
index 3045b27..28419e6 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -39,6 +39,8 @@ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDia
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
 

+    private OCFile mTargetFile;
+

     private static final String ARG_TARGET_FILE = "TARGET_FILE";
 
     /**
     private static final String ARG_TARGET_FILE = "TARGET_FILE";
 
     /**


@@ -54,29 +56,26 @@ implements ConfirmationDialogFragmentListener {
         int messageStringId = R.string.confirmation_remove_alert;
         
         int posBtn = R.string.confirmation_remove_remote;
         int messageStringId = R.string.confirmation_remove_alert;
         
         int posBtn = R.string.confirmation_remove_remote;

-        int neuBtn = -1;
+        int negBtn = -1;

         if (file.isFolder()) {
             messageStringId = R.string.confirmation_remove_folder_alert;
             posBtn = R.string.confirmation_remove_remote_and_local;
         if (file.isFolder()) {
             messageStringId = R.string.confirmation_remove_folder_alert;
             posBtn = R.string.confirmation_remove_remote_and_local;

-            neuBtn = R.string.confirmation_remove_folder_local;
+            negBtn = R.string.confirmation_remove_local;

         } else if (file.isDown()) {
             posBtn = R.string.confirmation_remove_remote_and_local;
         } else if (file.isDown()) {
             posBtn = R.string.confirmation_remove_remote_and_local;

-            neuBtn = R.string.confirmation_remove_local;
+            negBtn = R.string.confirmation_remove_local;

         }
         
         }
         

-        

         args.putInt(ARG_CONF_RESOURCE_ID, messageStringId);
         args.putStringArray(ARG_CONF_ARGUMENTS, new String[]{file.getFileName()});
         args.putInt(ARG_POSITIVE_BTN_RES, posBtn);
         args.putInt(ARG_CONF_RESOURCE_ID, messageStringId);
         args.putStringArray(ARG_CONF_ARGUMENTS, new String[]{file.getFileName()});
         args.putInt(ARG_POSITIVE_BTN_RES, posBtn);

-        args.putInt(ARG_NEUTRAL_BTN_RES, neuBtn);
-        args.putInt(ARG_NEGATIVE_BTN_RES, R.string.common_cancel);
+        args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_no);
+        args.putInt(ARG_NEGATIVE_BTN_RES, negBtn);

         args.putParcelable(ARG_TARGET_FILE, file);
         frag.setArguments(args);
         
         return frag;
     }
         args.putParcelable(ARG_TARGET_FILE, file);
         frag.setArguments(args);
         
         return frag;
     }

-
-    private OCFile mTargetFile;

     
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
     
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {


@@ -104,27 +103,27 @@ implements ConfirmationDialogFragmentListener {
      * Performs the removal of the local copy of the target file
      */
     @Override
      * Performs the removal of the local copy of the target file
      */
     @Override

-    public void onNeutral(String callerTag) {
+    public void onCancel(String callerTag) {

         ComponentsGetter cg = (ComponentsGetter)getActivity();
         cg.getFileOperationsHelper().removeFile(mTargetFile, true);
         
         FileDataStorageManager storageManager = cg.getStorageManager();
         
         ComponentsGetter cg = (ComponentsGetter)getActivity();
         cg.getFileOperationsHelper().removeFile(mTargetFile, true);
         
         FileDataStorageManager storageManager = cg.getStorageManager();
         

-        boolean containsKeepInSync = false;
+        boolean containsFavorite = false;

         if (mTargetFile.isFolder()) {
             // TODO Enable when "On Device" is recovered ?
             Vector<OCFile> files = storageManager.getFolderContent(mTargetFile/*, false*/);
             for(OCFile file: files) {
         if (mTargetFile.isFolder()) {
             // TODO Enable when "On Device" is recovered ?
             Vector<OCFile> files = storageManager.getFolderContent(mTargetFile/*, false*/);
             for(OCFile file: files) {

-                containsKeepInSync = file.keepInSync() || containsKeepInSync;
+                containsFavorite = file.isFavorite() || containsFavorite;

 
 

-                if (containsKeepInSync)
+                if (containsFavorite)

                     break;
             }
         }
 
                     break;
             }
         }
 

-        // Remove etag for parent, if file is a keep_in_sync 
-        // or is a folder and contains keep_in_sync        
-        if (mTargetFile.keepInSync() || containsKeepInSync) {
+        // Remove etag for parent, if file is a favorite
+        // or is a folder and contains favorite
+        if (mTargetFile.isFavorite() || containsFavorite) {

             OCFile folder = null;
             if (mTargetFile.isFolder()) {
                 folder = mTargetFile;
             OCFile folder = null;
             if (mTargetFile.isFolder()) {
                 folder = mTargetFile;


@@ -138,8 +137,7 @@ implements ConfirmationDialogFragmentListener {
     }
 
     @Override
     }
 
     @Override

-    public void onCancel(String callerTag) {
+    public void onNeutral(String callerTag) {

         // nothing to do here
     }
         // nothing to do here
     }

-    

 }
\ No newline at end of file
 }
\ No newline at end of file