X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5fc8be29f962b0bc746105ed1b6c90570bc74389..12c00057e7a4b279ad245d54d906e74a899aec4b:/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 9430692e..ec4def42 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -22,7 +22,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
 import java.lang.Thread.UncaughtExceptionHandler;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 
 import android.accounts.Account;
@@ -105,8 +104,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setProgressBarIndeterminateVisibility(false);
+        // TODO: fix hack: workaround for bug in actionbar sherlock
+        // it always shows indeterminate progress bar
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+            setProgressBarIndeterminateVisibility(false);
+        }
 
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
 
@@ -219,11 +222,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         AccountUtils.getCurrentOwnCloudAccount(this));
                 String remotepath = new String();
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
-                    remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j));
+                    remotepath += "/" + mDirectories.getItem(j);
                 }
                 if (!remotepath.endsWith("/"))
                     remotepath += "/";
-                remotepath += URLEncoder.encode(new File(filepath).getName());
+                remotepath += new File(filepath).getName();
+                remotepath = Uri.encode(remotepath, "/");
     
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);
@@ -258,7 +262,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDirs != null)
             for (String s : mDirs)
                 mDirectories.insert(s, 0);
-        mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR);
+        mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);
     }
     
     @Override
@@ -271,13 +275,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }
         }
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);
-        outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir);
+        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        
+
         if (accountsAreSetup()) {
 
             setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)
@@ -294,20 +298,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         
             // File list
             mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
-        
+            
             // Figure out what directory to list. 
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){
                 mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);
-                if(!mCurrentDir.isDirectory()){
+                if(mCurrentDir != null && !mCurrentDir.isDirectory()){
                     mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());
                 }
             
                 // Clear intent extra, so rotating the screen will not return us to this directory
                 getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);
-            } else {
-                mCurrentDir = mStorageManager.getFileByPath("/");
             }
+            
+            if (mCurrentDir == null)
+                mCurrentDir = mStorageManager.getFileByPath("/");
                 
             // Drop-Down navigation and file list restore
             mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
@@ -359,6 +364,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);
             syncBroadcastRevceiver = null;
         }
+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
     }
 
     @Override
@@ -409,10 +415,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             }
     
                             // Figure out the path where the dir needs to be created
-                            String path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
+                            String path;
+                            if (mCurrentDir == null) {
+                                // this is just a patch; we should ensure that mCurrentDir never is null
+                                if (!mStorageManager.fileExists("/")) {
+                                    OCFile file = new OCFile("/");
+                                    mStorageManager.saveFile(file);
+                                }
+                                mCurrentDir = mStorageManager.getFileByPath("/");
+                            }
+                            path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
                             
                             // Create directory
-                            path += directoryName + "/";
+                            path += Uri.encode(directoryName) + "/";
                             Thread thread = new Thread(new DirectoryCreator(path, a));
                             thread.start();