Merge branch 'develop' into videoInstandUploads

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / FileOperationsHelper.java

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index e413cde..ff571e5 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -17,8 +17,6 @@
 
 package com.owncloud.android.files;
 
 
 package com.owncloud.android.files;
 

-import java.io.File;
-import java.io.IOException;

 import org.apache.http.protocol.HTTP;
 
 import android.accounts.AccountManager;
 import org.apache.http.protocol.HTTP;
 
 import android.accounts.AccountManager;


@@ -37,7 +35,6 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;

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

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


@@ -49,9 +46,7 @@ public class FileOperationsHelper {
 
     private static final String TAG = FileOperationsHelper.class.getName();
     
 
     private static final String TAG = FileOperationsHelper.class.getName();
     

-    private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
-    
-    public final static int REQUEST_CODE_FILE_OPEN_HELPER = 100;
+    private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG"; 

 
     
     public void openFile(OCFile file, FileActivity callerActivity) {
 
     
     public void openFile(OCFile file, FileActivity callerActivity) {


@@ -120,7 +115,7 @@ public class FileOperationsHelper {
             service.putExtra(OperationsService.EXTRA_ACCOUNT, callerActivity.getAccount());
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             service.putExtra(OperationsService.EXTRA_SEND_INTENT, sendIntent);
             service.putExtra(OperationsService.EXTRA_ACCOUNT, callerActivity.getAccount());
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             service.putExtra(OperationsService.EXTRA_SEND_INTENT, sendIntent);

-            callerActivity.startService(service);
+            callerActivity.getOperationsServiceBinder().newOperation(service);

             
         } else {
             Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
             
         } else {
             Log_OC.wtf(TAG, "Trying to open a NULL OCFile");


@@ -144,8 +139,7 @@ public class FileOperationsHelper {
             AccountManager accountManager = AccountManager.get(callerActivity);
 
             String version = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION);
             AccountManager accountManager = AccountManager.get(callerActivity);
 
             String version = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION);

-            String versionString = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION_STRING);
-            return (new OwnCloudVersion(version, versionString)).isSharedSupported();
+            return (new OwnCloudVersion(version)).isSharedSupported();

             //return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API));
         }
         return false;
             //return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API));
         }
         return false;


@@ -160,7 +154,7 @@ public class FileOperationsHelper {
             service.setAction(OperationsService.ACTION_UNSHARE);
             service.putExtra(OperationsService.EXTRA_ACCOUNT, callerActivity.getAccount());
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             service.setAction(OperationsService.ACTION_UNSHARE);
             service.putExtra(OperationsService.EXTRA_ACCOUNT, callerActivity.getAccount());
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());

-            callerActivity.startService(service);
+            callerActivity.getOperationsServiceBinder().newOperation(service);

             
             callerActivity.showLoadingDialog();
             
             
             callerActivity.showLoadingDialog();
             


@@ -189,41 +183,5 @@ public class FileOperationsHelper {
             Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
         }
     }
             Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
         }
     }

-    
-    public void sendFileToApp(Intent sendIntent, FileActivity callerActivity) {
-        Uri filePath = sendIntent.getParcelableExtra(Intent.EXTRA_STREAM);
-        File file = new File(filePath.getPath());
-        Log_OC.d(TAG,  "FILE " + filePath.getPath());
-        if (file.exists()) {
-            File folder = new File(FileStorageUtils.getTemporalPath(callerActivity.getAccount().name) + "/send");
-            boolean success = true;
-            if (!folder.exists()) {
-                success = folder.mkdir();
-            }
-            if (success) {
-                File tmpFile = new File(folder.getAbsolutePath()+ "/" + file.getName());
-                try {
-                    tmpFile.createNewFile();
-                    FileStorageUtils.copyFile(file, tmpFile);
-                } catch (IOException e) {
-                    Log_OC.e(TAG,  "An error occurred while it was trying to copy in a temporal folder " + e.getMessage());
-                }
-                // Update Uri
-                Uri uri = Uri.fromFile(tmpFile);
-                sendIntent.removeExtra(Intent.EXTRA_STREAM);
-                sendIntent.putExtra(Intent.EXTRA_STREAM, uri);
-                callerActivity.startActivityForResult(sendIntent, REQUEST_CODE_FILE_OPEN_HELPER);
-            }
-        } else {
-            // Show a Message
-            Toast t = Toast.makeText(callerActivity, callerActivity.getString(R.string.send_file_missing_file), Toast.LENGTH_LONG);
-            t.show();
-            Log_OC.d(TAG,  "Missing file");
-        }

 
 

-    }
-    
-    
-    
-    

 }
 }