OCFile stores again decoded remote paths; WebdavUtils.encode(...) added; fixed space...

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 7e62084..45f7c77 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -117,7 +117,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if(savedInstanceState != null) {\r
             mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
             mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         if(savedInstanceState != null) {\r
             mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
             mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r

-            mDirectories.add("/");\r
+            mDirectories.add(OCFile.PATH_SEPARATOR);\r

             if (mDirs != null)\r
                 for (String s : mDirs)\r
                     mDirectories.insert(s, 0);\r
             if (mDirs != null)\r
                 for (String s : mDirs)\r
                     mDirectories.insert(s, 0);\r


@@ -170,8 +170,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;\r
             }\r
             case R.id.startSync: {\r
                 break;\r
             }\r
             case R.id.startSync: {\r

-                // This could be interesting\r
-                //ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any other ownCloud account\r
+                ContentResolver.cancelSync(null, "org.owncloud");   // 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
                 Bundle bundle = new Bundle();\r
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
                 ContentResolver.requestSync(\r


@@ -245,12 +244,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         AccountUtils.getCurrentOwnCloudAccount(this));\r
                 String remotepath = new String();\r
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
                         AccountUtils.getCurrentOwnCloudAccount(this));\r
                 String remotepath = new String();\r
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r

-                    remotepath += "/" + mDirectories.getItem(j);\r
+                    remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r

                 }\r
                 }\r

-                if (!remotepath.endsWith("/"))\r
-                    remotepath += "/";\r
+                if (!remotepath.endsWith(OCFile.PATH_SEPARATOR))\r
+                    remotepath += OCFile.PATH_SEPARATOR;\r

                 remotepath += new File(filepath).getName();\r
                 remotepath += new File(filepath).getName();\r

-                remotepath = Uri.encode(remotepath, "/");\r

     \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
     \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r


@@ -370,7 +368,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 for (String s : mDirs)\r
                     mDirectories.add(s);\r
             } else {\r
                 for (String s : mDirs)\r
                     mDirectories.add(s);\r
             } else {\r

-                mDirectories.add("/");\r
+                mDirectories.add(OCFile.PATH_SEPARATOR);\r

             }\r
                \r
             // Actionbar setup\r
             }\r
                \r
             // Actionbar setup\r


@@ -457,16 +455,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             String path;\r
                             if (mCurrentDir == null) {\r
                                 // this is just a patch; we should ensure that mCurrentDir never is null\r
                             String path;\r
                             if (mCurrentDir == null) {\r
                                 // this is just a patch; we should ensure that mCurrentDir never is null\r

-                                if (!mStorageManager.fileExists("/")) {\r
-                                    OCFile file = new OCFile("/");\r
+                                if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {\r
+                                    OCFile file = new OCFile(OCFile.PATH_SEPARATOR);\r

                                     mStorageManager.saveFile(file);\r
                                 }\r
                                     mStorageManager.saveFile(file);\r
                                 }\r

-                                mCurrentDir = mStorageManager.getFileByPath("/");\r
+                                mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);\r

                             }\r
                             path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
                             \r
                             // Create directory\r
                             }\r
                             path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
                             \r
                             // Create directory\r

-                            path += Uri.encode(directoryName) + "/";\r
+                            path += directoryName + OCFile.PATH_SEPARATOR;\r

                             Thread thread = new Thread(new DirectoryCreator(path, a));\r
                             thread.start();\r
     \r
                             Thread thread = new Thread(new DirectoryCreator(path, a));\r
                             thread.start();\r
     \r