Merge tag 'oc-android-1-3-22' into oauth_login

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

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index c8dbca9..eb218d0 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -75,7 +75,7 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileObserverService;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.files.services.FileObserverService;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r

-import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.operations.CreateFolderOperation;\r

 import com.owncloud.android.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r


@@ -91,7 +91,6 @@ import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r
 import com.owncloud.android.R;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r
 import com.owncloud.android.R;\r

-import eu.alefzero.webdav.WebdavClient;\r

 \r
 /**\r
  * Displays, what files the user has available in his ownCloud.\r
 \r
 /**\r
  * Displays, what files the user has available in his ownCloud.\r


@@ -119,6 +118,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private OCFileListFragment mFileList;\r
     \r
     private boolean mDualPane;\r
     private OCFileListFragment mFileList;\r
     \r
     private boolean mDualPane;\r

+    private Handler mHandler;\r

     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r


@@ -141,6 +141,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r

+        \r
+        mHandler = new Handler();\r

 \r
         /// Load of parameters from received intent\r
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
 \r
         /// Load of parameters from received intent\r
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r


@@ -249,7 +251,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */\r
     private void createFirstAccount() {\r
         Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
      */\r
     private void createFirstAccount() {\r
         Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r

-        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTHORITY });\r

         startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
     }\r
 \r
         startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
     }\r
 \r


@@ -378,12 +380,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
     private void startSynchronization() {\r
     }\r
 \r
     private void startSynchronization() {\r

-        ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
+        ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY);   // cancel the current synchronizations of any ownCloud account\r

         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
         ContentResolver.requestSync(\r
                 AccountUtils.getCurrentOwnCloudAccount(this),\r
         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
         ContentResolver.requestSync(\r
                 AccountUtils.getCurrentOwnCloudAccount(this),\r

-                AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
+                AccountAuthenticator.AUTHORITY, bundle);\r

     }\r
 \r
 \r
     }\r
 \r
 \r


@@ -686,8 +688,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             \r
                             // Create directory\r
                             path += directoryName + OCFile.PATH_SEPARATOR;\r
                             \r
                             // Create directory\r
                             path += directoryName + OCFile.PATH_SEPARATOR;\r

-                            Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));\r
-                            thread.start();\r
+                            RemoteOperation operation = new CreateFolderOperation(path, mCurrentDir.getFileId(), mStorageManager);\r
+                            operation.execute(  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), \r
+                                                FileDisplayActivity.this, \r
+                                                FileDisplayActivity.this, \r
+                                                mHandler,\r
+                                                FileDisplayActivity.this);\r

                             \r
                             dialog.dismiss();\r
                             \r
                             \r
                             dialog.dismiss();\r
                             \r


@@ -805,56 +811,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         return !mDirectories.isEmpty();\r
     }\r
 \r
         return !mDirectories.isEmpty();\r
     }\r
 \r

-    private class DirectoryCreator implements Runnable {\r
-        private String mTargetPath;\r
-        private Account mAccount;\r
-        private Handler mHandler; \r
-    \r
-        public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
-            mTargetPath = targetPath;\r
-            mAccount = account;\r
-            mHandler = handler;\r
-        }\r
-    \r
-        @Override\r
-        public void run() {\r
-            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r
-            boolean created = wdc.createDirectory(mTargetPath);\r
-            if (created) {\r
-                mHandler.post(new Runnable() {\r
-                    @Override\r
-                    public void run() { \r
-                        dismissDialog(DIALOG_SHORT_WAIT);\r
-                        \r
-                        // Save new directory in local database\r
-                        OCFile newDir = new OCFile(mTargetPath);\r
-                        newDir.setMimetype("DIR");\r
-                        newDir.setParentId(mCurrentDir.getFileId());\r
-                        mStorageManager.saveFile(newDir);\r
-    \r
-                        // Display the new folder right away\r
-                        mFileList.listDirectory();\r
-                    }\r
-                });\r
-                \r
-            } else {\r
-                mHandler.post(new Runnable() {\r
-                    @Override\r
-                    public void run() {\r
-                        dismissDialog(DIALOG_SHORT_WAIT);\r
-                        try {\r
-                            Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); \r
-                            msg.show();\r
-                        \r
-                        } catch (NotFoundException e) {\r
-                            Log.e(TAG, "Error while trying to show fail message " , e);\r
-                        }\r
-                    }\r
-                });\r
-            }\r
-        }\r
-    \r
-    }\r

 \r
     // Custom array adapter to override text colors\r
     private class CustomArrayAdapter<T> extends ArrayAdapter<T> {\r
 \r
     // Custom array adapter to override text colors\r
     private class CustomArrayAdapter<T> extends ArrayAdapter<T> {\r


@@ -1155,6 +1111,32 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
         } else if (operation instanceof SynchronizeFileOperation) {\r
             onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);\r
             \r
         } else if (operation instanceof SynchronizeFileOperation) {\r
             onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);\r

+            \r
+        } else if (operation instanceof CreateFolderOperation) {\r
+            onCreateFolderOperationFinish((CreateFolderOperation)operation, result);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Updates the view associated to the activity after the finish of an operation trying create a new folder\r
+     * \r
+     * @param operation     Creation operation performed.\r
+     * @param result        Result of the creation.\r
+     */\r
+    private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {\r
+        if (result.isSuccess()) {\r
+            dismissDialog(DIALOG_SHORT_WAIT);\r
+            mFileList.listDirectory();\r
+            \r
+        } else {\r
+            dismissDialog(DIALOG_SHORT_WAIT);\r
+            try {\r
+                Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); \r
+                msg.show();\r
+                    \r
+            } catch (NotFoundException e) {\r
+                Log.e(TAG, "Error while trying to show fail message " , e);\r
+            }\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r