That stack is not needed

[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 126e338..a38f39b 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -62,7 +62,6 @@ import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.syncadapter.FileSyncService;\r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.syncadapter.FileSyncService;\r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r

-import eu.alefzero.owncloud.utils.OwnCloudVersion;\r

 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r


@@ -84,8 +83,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \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

-\r
-    private static final int REQUEST_ACCOUNT_SETUP = 0;\r

     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     public void pushPath(String path) {\r
     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     public void pushPath(String path) {\r


@@ -175,9 +172,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r

-        // if (getSupportFragmentManager().findFragmentById(R.id.fileList) ==\r
-        // null)\r
-        Log.e("ASDaaa", "ASDaaa");\r
+        \r

         setContentView(R.layout.files);\r
 \r
     }\r
         setContentView(R.layout.files);\r
 \r
     }\r


@@ -256,9 +251,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r

-        mDirs = new String[mDirectories.getCount()-1];\r
-        for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
-            mDirs[i] = mDirectories.getItem(j);\r
+        if(mDirectories != null){\r
+            mDirs = new String[mDirectories.getCount()-1];\r
+            for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
+                mDirs[i] = mDirectories.getItem(j);\r
+            }\r

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


@@ -281,7 +278,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 mDirectories.insert(s, 0);\r
             FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
                     .findFragmentById(R.id.fileList);\r
                 mDirectories.insert(s, 0);\r
             FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
                     .findFragmentById(R.id.fileList);\r

-            if (fileListFramgent != null) fileListFramgent.populateFileList();\r
+            if (fileListFramgent != null) fileListFramgent.listDirectory();\r

         }\r
 \r
         mStorageManager = new FileDataStorageManager(\r
         }\r
 \r
         mStorageManager = new FileDataStorageManager(\r


@@ -295,7 +292,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
     }\r
 \r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r

-        Log.e("ASD", requestCode + " " + resultCode);\r

         if (resultCode == RESULT_OK) {\r
             if (requestCode == ACTION_SELECT_FILE) {\r
                 Uri selectedImageUri = data.getData();\r
         if (resultCode == RESULT_OK) {\r
             if (requestCode == ACTION_SELECT_FILE) {\r
                 Uri selectedImageUri = data.getData();\r


@@ -319,17 +315,16 @@ 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 += "/" + URLDecoder.decode(mDirectories.getItem(j));\r
+                    remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j));\r

                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r
                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r

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

                 Log.e("ASD", remotepath + "");\r
 \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
                 Log.e("ASD", remotepath + "");\r
 \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r

-                i.putExtra(FileUploader.KEY_UPLOAD_TYPE,\r
-                        FileUploader.UPLOAD_SINGLE_FILE);\r
+                i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r

                 startService(i);\r
             }\r
         }\r
                 startService(i);\r
             }\r
         }\r


@@ -465,7 +460,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
                         .findFragmentById(R.id.fileList);\r
                 if (fileListFramgent != null)\r
                 FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
                         .findFragmentById(R.id.fileList);\r
                 if (fileListFramgent != null)\r

-                    fileListFramgent.populateFileList();\r
+                    fileListFramgent.listDirectory();\r

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