X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4ee419da912da08b241551ae54f64bb8d8986623..99c46398f1020cf35895a690e1ca8ad1de75f3c7:/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 126e3387..a38f39bf 100644
--- 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;
 import eu.alefzero.owncloud.syncadapter.FileSyncService;
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
 import eu.alefzero.webdav.WebdavClient;
 
 /**
@@ -84,8 +83,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
     private static final int DIALOG_SETUP_ACCOUNT = 0;
     private static final int DIALOG_CREATE_DIR = 1;
-
-    private static final int REQUEST_ACCOUNT_SETUP = 0;
     private static final int ACTION_SELECT_FILE = 1;
 
     public void pushPath(String path) {
@@ -175,9 +172,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setProgressBarIndeterminateVisibility(false);
-        // if (getSupportFragmentManager().findFragmentById(R.id.fileList) ==
-        // null)
-        Log.e("ASDaaa", "ASDaaa");
+        
         setContentView(R.layout.files);
 
     }
@@ -256,9 +251,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        mDirs = new String[mDirectories.getCount()-1];
-        for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {
-            mDirs[i] = mDirectories.getItem(j);
+        if(mDirectories != null){
+            mDirs = new String[mDirectories.getCount()-1];
+            for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {
+                mDirs[i] = mDirectories.getItem(j);
+            }
         }
     }
 
@@ -281,7 +278,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 mDirectories.insert(s, 0);
             FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()
                     .findFragmentById(R.id.fileList);
-            if (fileListFramgent != null) fileListFramgent.populateFileList();
+            if (fileListFramgent != null) fileListFramgent.listDirectory();
         }
 
         mStorageManager = new FileDataStorageManager(
@@ -295,7 +292,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.e("ASD", requestCode + " " + resultCode);
         if (resultCode == RESULT_OK) {
             if (requestCode == ACTION_SELECT_FILE) {
                 Uri selectedImageUri = data.getData();
@@ -319,17 +315,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         AccountUtils.getCurrentOwnCloudAccount(this));
                 String remotepath = new String();
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
-                    remotepath += "/" + URLDecoder.decode(mDirectories.getItem(j));
+                    remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j));
                 }
                 if (!remotepath.endsWith("/"))
                     remotepath += "/";
-                remotepath += new File(filepath).getName();
+                remotepath += URLEncoder.encode(new File(filepath).getName());
                 Log.e("ASD", remotepath + "");
 
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);
-                i.putExtra(FileUploader.KEY_UPLOAD_TYPE,
-                        FileUploader.UPLOAD_SINGLE_FILE);
+                i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
                 startService(i);
             }
         }
@@ -465,7 +460,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()
                         .findFragmentById(R.id.fileList);
                 if (fileListFramgent != null)
-                    fileListFramgent.populateFileList();
+                    fileListFramgent.listDirectory();
             }
         }