Directory creation fixed, navigating up from FileDetailsActivity now

works reliably, better documentation

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index fb3106c..3310ff4 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -21,6 +21,8 @@ package eu.alefzero.owncloud.ui.activity;
 import java.io.File;\r
 import java.net.URLDecoder;\r
 import java.net.URLEncoder;\r
 import java.io.File;\r
 import java.net.URLDecoder;\r
 import java.net.URLEncoder;\r

+import java.util.ArrayList;\r
+import java.util.Arrays;\r

 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r


@@ -61,6 +63,7 @@ import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.syncadapter.FileSyncService;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.syncadapter.FileSyncService;\r

+import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;\r

 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r


@@ -75,11 +78,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         OnNavigationListener, OnClickListener {\r
     private ArrayAdapter<String> mDirectories;\r
     private DataStorageManager mStorageManager;\r
         OnNavigationListener, OnClickListener {\r
     private ArrayAdapter<String> mDirectories;\r
     private DataStorageManager mStorageManager;\r

+    private FileListFragment mFileList;\r
+    private OCFile mCurrentDir;\r

     private String[] mDirs = null;\r
 \r
     private SyncBroadcastReceiver syncBroadcastRevceiver;\r
 \r
     private String[] mDirs = null;\r
 \r
     private SyncBroadcastReceiver syncBroadcastRevceiver;\r
 \r

-    private static final String KEY_DIR = "DIR";\r
+    private static final String KEY_DIR_ARRAY = "DIR_ARRAY";\r
+    private static final String KEY_CURRENT_DIR = "DIR";\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


@@ -97,8 +103,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
         \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
         \r

+        if(savedInstanceState != null){\r
+            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
+        }\r
+        \r

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

-\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -155,6 +164,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         return true;\r
     }\r
 \r
         return true;\r
     }\r
 \r

+    /**\r
+     * Called, when the user selected something for uploading\r
+     */\r

     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         if (resultCode == RESULT_OK) {\r
             if (requestCode == ACTION_SELECT_FILE) {\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         if (resultCode == RESULT_OK) {\r
             if (requestCode == ACTION_SELECT_FILE) {\r


@@ -200,9 +212,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             finish();\r
             return;\r
         }\r
             finish();\r
             return;\r
         }\r

-        popPath();\r
-        ((FileListFragment) getSupportFragmentManager().findFragmentById(\r
-                R.id.fileList)).onNavigateUp();\r
+        popDirname();\r
+        mFileList.onNavigateUp();\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -212,7 +223,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (!accountsAreSetup()) {\r
             showDialog(DIALOG_SETUP_ACCOUNT);\r
         }\r
         if (!accountsAreSetup()) {\r
             showDialog(DIALOG_SETUP_ACCOUNT);\r
         }\r

-        mDirs = savedInstanceState.getStringArray(KEY_DIR);\r
+        mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r

         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories.add("/");\r
         if (mDirs != null)\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories.add("/");\r
         if (mDirs != null)\r


@@ -229,38 +240,78 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 mDirs[i] = mDirectories.getItem(j);\r
             }\r
         }\r
                 mDirs[i] = mDirectories.getItem(j);\r
             }\r
         }\r

+        outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
+        outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir);\r

     }\r
 \r
     @Override\r
     protected void onResume() {\r
         super.onResume();\r
     }\r
 \r
     @Override\r
     protected void onResume() {\r
         super.onResume();\r

+        \r
+        //TODO: Dialog useless -> get rid of this\r

         if (!accountsAreSetup()) {\r
             showDialog(DIALOG_SETUP_ACCOUNT);\r
             return;\r
         }\r
 \r
         if (!accountsAreSetup()) {\r
             showDialog(DIALOG_SETUP_ACCOUNT);\r
             return;\r
         }\r
 \r

-        IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
+        // Listen for sync messages\r
+        IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r

         syncBroadcastRevceiver = new SyncBroadcastReceiver();\r
         syncBroadcastRevceiver = new SyncBroadcastReceiver();\r

-        registerReceiver(syncBroadcastRevceiver, f);\r
-\r
+        registerReceiver(syncBroadcastRevceiver, syncIntentFilter);\r
+        \r
+        // Storage manager initialization\r
+        mStorageManager = new FileDataStorageManager(\r
+                AccountUtils.getCurrentOwnCloudAccount(this),\r
+                getContentResolver());\r
+        \r
+        // File list\r
+        mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+        \r
+        // Figure out what directory to list. \r
+        // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
+        if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
+            mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
+            if(!mCurrentDir.isDirectory()){\r
+                mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
+            }\r
+        } \r
+                \r
+        // Drop-Down navigation and file list restore\r

         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r

-        mDirectories.add("/");\r
+        \r
+        \r
+        // Given the case we have a file to display:\r
+        if(mCurrentDir != null){\r
+            ArrayList<OCFile> files = new ArrayList<OCFile>();\r
+            OCFile currFile = mCurrentDir;\r
+            while(currFile != null){\r
+                files.add(currFile);\r
+                currFile = mStorageManager.getFileById(currFile.getParentId());\r
+            }\r
+            \r
+            // Insert in mDirs\r
+            mDirs = new String[files.size()];\r
+            for(int i = files.size() - 1; i >= 0; i--){\r
+                mDirs[i] = files.get(i).getFileName();\r
+            }\r
+        }\r
+        \r

         if (mDirs != null) {\r
             for (String s : mDirs)\r
         if (mDirs != null) {\r
             for (String s : mDirs)\r

-                mDirectories.insert(s, 0);\r
-            FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
-                    .findFragmentById(R.id.fileList);\r
-            if (fileListFramgent != null) fileListFramgent.listDirectory();\r
+                mDirectories.add(s);\r
+        } else {\r
+            mDirectories.add("/");\r

         }\r
         }\r

-\r
-        mStorageManager = new FileDataStorageManager(\r
-                AccountUtils.getCurrentOwnCloudAccount(this),\r
-                getContentResolver());\r
+               \r
+        // Actionbar setup\r

         ActionBar action_bar = getSupportActionBar();\r
         action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
         action_bar.setDisplayShowTitleEnabled(false);\r
         action_bar.setListNavigationCallbacks(mDirectories, this);\r
         action_bar.setDisplayHomeAsUpEnabled(true);\r
         ActionBar action_bar = getSupportActionBar();\r
         action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
         action_bar.setDisplayShowTitleEnabled(false);\r
         action_bar.setListNavigationCallbacks(mDirectories, this);\r
         action_bar.setDisplayHomeAsUpEnabled(true);\r

+        \r
+        // List dir here\r
+        mFileList.listDirectory(mCurrentDir);\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -289,39 +340,40 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             break;\r
         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r
             break;\r
         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r

-            final EditText dirName = new EditText(getBaseContext());\r
+            final EditText dirNameInput = new EditText(getBaseContext());\r

             final Account a = AccountUtils.getCurrentOwnCloudAccount(this);\r
             final Account a = AccountUtils.getCurrentOwnCloudAccount(this);\r

-            builder.setView(dirName);\r
+            builder.setView(dirNameInput);\r

             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r

-            dirName.setTextColor(typed_color);\r
+            dirNameInput.setTextColor(typed_color);\r

     \r
             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\r
     \r
             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\r

-                            String s = dirName.getText().toString();\r
-                            if (s.trim().length() == 0) {\r
+                            String directoryName = dirNameInput.getText().toString();\r
+                            if (directoryName.trim().length() == 0) {\r

                                 dialog.cancel();\r
                                 return;\r
                             }\r
     \r
                                 dialog.cancel();\r
                                 return;\r
                             }\r
     \r

-                            String path = "";\r
-                            for (int i = mDirectories.getCount() - 2; i >= 0; --i) {\r
-                                path += "/" + mDirectories.getItem(i);\r
-                            }\r
-                            OCFile parent = mStorageManager.getFileByPath(path\r
-                                    + "/");\r
-                            path += s + "/";\r
+                            // Figure out the path where the dir needs to be created\r
+                            String path = mCurrentDir.getRemotePath();\r
+                            \r
+                            // Create directory\r
+                            path += directoryName + "/";\r

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

-                            OCFile new_file = new OCFile(path);\r
-                            new_file.setMimetype("DIR");\r
-                            new_file.setParentId(parent.getParentId());\r
-                            mStorageManager.saveFile(new_file);\r
+                            // Save new directory in local database\r
+                            OCFile newDir = new OCFile(path);\r
+                            newDir.setMimetype("DIR");\r
+                            newDir.setParentId(mCurrentDir.getFileId());\r
+                            mStorageManager.saveFile(newDir);\r

     \r
     \r

+                            // Display the new folder right away\r

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

+                            mFileList.listDirectory(mCurrentDir);\r

                         }\r
                     });\r
             builder.setNegativeButton(R.string.common_cancel,\r
                         }\r
                     });\r
             builder.setNegativeButton(R.string.common_cancel,\r


@@ -340,6 +392,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         return dialog;\r
     }\r
 \r
         return dialog;\r
     }\r
 \r

+    \r
+    /**\r
+     * Responds to the "There are no ownCloud Accounts setup" dialog\r
+     * TODO: Dialog is 100% useless -> Remove\r
+     */\r
+    @Override\r

     public void onClick(DialogInterface dialog, int which) {\r
         // In any case - we won't need it anymore\r
         dialog.dismiss();\r
     public void onClick(DialogInterface dialog, int which) {\r
         // In any case - we won't need it anymore\r
         dialog.dismiss();\r


@@ -356,6 +414,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     }\r
 \r
     \r
     }\r
 \r

+    /**\r
+     * Translates a content URI of an image to a physical path\r
+     * on the disk\r
+     * @param uri The URI to resolve\r
+     * @return The path to the image or null if it could not be found\r
+     */\r

     public String getPath(Uri uri) {\r
         String[] projection = { MediaStore.Images.Media.DATA };\r
         Cursor cursor = managedQuery(uri, projection, null, null, null);\r
     public String getPath(Uri uri) {\r
         String[] projection = { MediaStore.Images.Media.DATA };\r
         Cursor cursor = managedQuery(uri, projection, null, null, null);\r


@@ -364,15 +428,28 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);\r
             cursor.moveToFirst();\r
             return cursor.getString(column_index);\r
                     .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);\r
             cursor.moveToFirst();\r
             return cursor.getString(column_index);\r

-        } else\r
-            return null;\r
+        } \r
+        return null;\r

     }\r
     }\r

-\r
-    public void pushPath(String path) {\r
-        mDirectories.insert(path, 0);\r
+    \r
+    /**\r
+     * Pushes a directory to the drop down list\r
+     * @param directory to push\r
+     * @throws IllegalArgumentException If the {@link OCFile#isDirectory()} returns false.\r
+     */\r
+    public void pushDirname(OCFile directory) {\r
+        if(!directory.isDirectory()){\r
+            throw new IllegalArgumentException("Only directories may be pushed!");\r
+        }\r
+        mDirectories.insert(directory.getFileName(), 0);\r
+        mCurrentDir = directory;\r

     }\r
 \r
     }\r
 \r

-    public boolean popPath() {\r
+    /**\r
+     * Pops a directory name from the drop down list\r
+     * @return True, unless the stack is empty\r
+     */\r
+    public boolean popDirname() {\r

         mDirectories.remove(mDirectories.getItem(0));\r
         return !mDirectories.isEmpty();\r
     }\r
         mDirectories.remove(mDirectories.getItem(0));\r
         return !mDirectories.isEmpty();\r
     }\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index 86c77c7..474416e 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -90,14 +90,10 @@ public class FileListFragment extends FragmentListView {
         \r
         // Update ActionBarPath\r
         if (file.getMimetype().equals("DIR")) {\r
         \r
         // Update ActionBarPath\r
         if (file.getMimetype().equals("DIR")) {\r

-            String dirname = file.getFileName();\r

             mFile = file;\r
             mFile = file;\r

-            \r
-            ((FileDisplayActivity) getActivity()).pushPath(dirname);\r
-            \r
+            ((FileDisplayActivity) getActivity()).pushDirname(file);\r

             listDirectory(file);\r
             resetFileFragment();\r
             listDirectory(file);\r
             resetFileFragment();\r

-\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -151,6 +147,15 @@ public class FileListFragment extends FragmentListView {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

+     * Use this to query the {@link OCFile} that is currently\r
+     * being displayed by this fragment\r
+     * @return The currently viewed OCFile\r
+     */\r
+    public OCFile getCurrentFile(){\r
+        return mFile;\r
+    }\r
+    \r
+    /**\r

      * Calls {@link FileListFragment#listDirectory(OCFile)} with a null parameter\r
      */\r
     public void listDirectory(){\r
      * Calls {@link FileListFragment#listDirectory(OCFile)} with a null parameter\r
      */\r
     public void listDirectory(){\r


@@ -175,11 +180,14 @@ public class FileListFragment extends FragmentListView {
             }\r
         }\r
         \r
             }\r
         }\r
         \r

+        \r

         // If that's not a directory -> List its parent\r
         if(!directory.isDirectory()){\r
             Log.w(TAG, "You see, that is not a directory -> " + directory.toString());\r
             directory = mStorageManager.getFileById(directory.getParentId());\r
         }\r
         // If that's not a directory -> List its parent\r
         if(!directory.isDirectory()){\r
             Log.w(TAG, "You see, that is not a directory -> " + directory.toString());\r
             directory = mStorageManager.getFileById(directory.getParentId());\r
         }\r

+\r
+        mFile = directory;\r

         \r
         mFiles = mStorageManager.getDirectoryContent(directory);\r
         if (mFiles == null || mFiles.size() == 0) {\r
         \r
         mFiles = mStorageManager.getDirectoryContent(directory);\r
         if (mFiles == null || mFiles.size() == 0) {\r