OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 42b90ae..1b21107 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -18,6 +18,8 @@
 
 package com.owncloud.android.ui.activity;
 
 
 package com.owncloud.android.ui.activity;
 

+import java.io.File;
+

 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;


@@ -52,6 +54,7 @@ import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.dialog.LoadingDialog;

+import com.owncloud.android.utils.FileStorageUtils;

 import com.owncloud.android.utils.Log_OC;
 
 
 import com.owncloud.android.utils.Log_OC;
 
 


@@ -157,6 +160,7 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler);
         }
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler);
         }

+        

     }
     
     
     }
     
     


@@ -376,7 +380,7 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
     public FileOperationsHelper getFileOperationsHelper() {
         return mFileOperationsHelper;
     }
     public FileOperationsHelper getFileOperationsHelper() {
         return mFileOperationsHelper;
     }

-    
+

     /**
      * 
      * @param operation     Removal operation performed.
     /**
      * 
      * @param operation     Removal operation performed.


@@ -492,6 +496,23 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
                 // TODO whatever could be waiting for the service is unbound
             }
         }
                 // TODO whatever could be waiting for the service is unbound
             }
         }

-    };    
-    
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        
+        Log_OC.d(TAG, "requestCode " + String.valueOf(requestCode) );
+        if (requestCode == FileOperationsHelper.REQUEST_CODE_FILE_OPEN_HELPER) {
+            // Remove "send" folder
+            File folder = new File(FileStorageUtils.getTemporalPath(getAccount().name) + "/send");
+            if (folder.exists()) {
+                FileStorageUtils.deleteFolder(folder);
+            }
+        }
+        
+    };
+
+

 }
 }