include appverion in crashlog

[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 ef31ce8..c2a8090 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,9 +18,12 @@
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r

+import java.io.BufferedReader;\r

 import java.io.File;\r
 import java.io.File;\r

-import java.net.URLDecoder;\r
+import java.io.InputStreamReader;\r
+import java.lang.Thread.UncaughtExceptionHandler;\r

 import java.net.URLEncoder;\r
 import java.net.URLEncoder;\r

+import java.util.ArrayList;\r

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


@@ -34,14 +37,19 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r

+import android.content.pm.PackageInfo;\r
+import android.content.pm.PackageManager;\r
+import android.content.pm.PackageManager.NameNotFoundException;\r

 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\r

+import android.telephony.TelephonyManager;\r

 import android.util.Log;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r

+import android.widget.CheckedTextView;\r

 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r


@@ -54,6 +62,7 @@ import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r
 import com.actionbarsherlock.view.Window;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r

+import eu.alefzero.owncloud.CrashHandler;\r

 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r


@@ -61,8 +70,8 @@ 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.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


@@ -73,272 +82,402 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r

-        OnNavigationListener, OnClickListener {\r
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r

     private ArrayAdapter<String> mDirectories;\r
     private DataStorageManager mStorageManager;\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
     private String[] mDirs = null;\r
 \r
     private SyncBroadcastReceiver syncBroadcastRevceiver;\r

-\r
-    private static final String KEY_DIR = "DIR";\r
+    \r
+    private View mLayoutView = null;\r
+    \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

-\r
-    private static final int REQUEST_ACCOUNT_SETUP = 0;\r
+    private static final int DIALOG_ABOUT_APP = 2;\r

     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     private static final int ACTION_SELECT_FILE = 1;\r
 \r

-    public void pushPath(String path) {\r
-        mDirectories.insert(path, 0);\r
-    }\r
-\r
-    public boolean popPath() {\r
-        mDirectories.remove(mDirectories.getItem(0));\r
-        return !mDirectories.isEmpty();\r
-    }\r
-\r

     @Override\r
     @Override\r

-    protected Dialog onCreateDialog(int id) {\r
-        Dialog dialog;\r
-        AlertDialog.Builder builder;\r
-        switch (id) {\r
-        case DIALOG_SETUP_ACCOUNT:\r
-            builder = new AlertDialog.Builder(this);\r
-            builder.setTitle(R.string.main_tit_accsetup);\r
-            builder.setMessage(R.string.main_wrn_accsetup);\r
-            builder.setCancelable(false);\r
-            builder.setPositiveButton(android.R.string.ok, this);\r
-            builder.setNegativeButton(android.R.string.cancel, this);\r
-            dialog = builder.create();\r
-            break;\r
-        case DIALOG_CREATE_DIR: {\r
-            builder = new Builder(this);\r
-            final EditText dirName = new EditText(getBaseContext());\r
-            final Account a = AccountUtils.getCurrentOwnCloudAccount(this);\r
-            builder.setView(dirName);\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
-\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
-                                dialog.cancel();\r
-                                return;\r
-                            }\r
+    public void onCreate(Bundle savedInstanceState) {\r
+        super.onCreate(savedInstanceState);\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
-                            Thread thread = new Thread(new DirectoryCreator(\r
-                                    path, a));\r
-                            thread.start();\r
+        // TODO: fix hack: workaround for bug in actionbar sherlock\r
+        // it always shows indeterminate progress bar\r
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {\r
+            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
+            setProgressBarIndeterminateVisibility(false);\r
+        }\r

 \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
+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r

 \r
 \r

-                            dialog.dismiss();\r
-                        }\r
-                    });\r
-            builder.setNegativeButton(R.string.common_cancel,\r
-                    new OnClickListener() {\r
-                        public void onClick(DialogInterface dialog, int which) {\r
-                            dialog.cancel();\r
-                        }\r
-                    });\r
-            dialog = builder.create();\r
-            break;\r
+        if(savedInstanceState != null){\r
+            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r

         }\r
         }\r

-        default:\r
-            dialog = null;\r
+        \r
+        if (findViewById(R.id.file_list_view) == null) \r
+            mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
+        \r
+        //TODO: Dialog useless -> get rid of this\r
+        if (!accountsAreSetup()) {\r
+            setContentView(R.layout.no_account_available);\r
+            setProgressBarIndeterminateVisibility(false);\r
+            getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
+            findViewById(R.id.setup_account).setOnClickListener(this);\r
+            \r
+        } else if (findViewById(R.id.file_list_view) == null) {\r
+            setContentView(mLayoutView);\r

         }\r
         }\r

-\r
-        return dialog;\r
+        \r

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

-    public void onCreate(Bundle savedInstanceState) {\r
-        super.onCreate(savedInstanceState);\r
-\r
-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-            return;\r
-        }\r
-\r
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
-        setProgressBarIndeterminateVisibility(false);\r
-        // if (getSupportFragmentManager().findFragmentById(R.id.fileList) ==\r
-        // null)\r
-        setContentView(R.layout.files);\r
-\r
+    public boolean onCreateOptionsMenu(Menu menu) {\r
+        MenuInflater inflater = getSherlock().getMenuInflater();\r
+            inflater.inflate(R.menu.menu, menu);\r
+            return true;\r

     }\r
 \r
     @Override\r
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r
     }\r
 \r
     @Override\r
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r

-        case R.id.settingsItem: {\r
-            Intent i = new Intent(this, Preferences.class);\r
-            startActivity(i);\r
-            break;\r
-        }\r
-        case R.id.createDirectoryItem: {\r
-            showDialog(DIALOG_CREATE_DIR);\r
-            break;\r
-        }\r
-        case R.id.startSync: {\r
-            Bundle bundle = new Bundle();\r
-            bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
-            ContentResolver.requestSync(\r
-                    AccountUtils.getCurrentOwnCloudAccount(this),\r
-                    "org.owncloud", bundle);\r
-            break;\r
-        }\r
-        case R.id.action_upload: {\r
-            Intent action = new Intent(Intent.ACTION_GET_CONTENT);\r
-            action = action.setType("*/*")\r
-                    .addCategory(Intent.CATEGORY_OPENABLE);\r
-            startActivityForResult(\r
-                    Intent.createChooser(action, "Upload file from..."),\r
-                    ACTION_SELECT_FILE);\r
-            break;\r
+            case R.id.createDirectoryItem: {\r
+                showDialog(DIALOG_CREATE_DIR);\r
+                break;\r
+            }\r
+            case R.id.startSync: {\r
+                Bundle bundle = new Bundle();\r
+                bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
+                ContentResolver.requestSync(\r
+                        AccountUtils.getCurrentOwnCloudAccount(this),\r
+                        "org.owncloud", bundle);\r
+                break;\r
+            }\r
+            case R.id.action_upload: {\r
+                Intent action = new Intent(Intent.ACTION_GET_CONTENT);\r
+                action = action.setType("*/*")\r
+                        .addCategory(Intent.CATEGORY_OPENABLE);\r
+                startActivityForResult(\r
+                        Intent.createChooser(action, "Upload file from..."),\r
+                        ACTION_SELECT_FILE);\r
+                break;\r
+            }\r
+            case R.id.action_settings: {\r
+                Intent settingsIntent = new Intent(this, Preferences.class);\r
+                startActivity(settingsIntent);\r
+                break;\r
+            }\r
+            case R.id.about_app : {\r
+                showDialog(DIALOG_ABOUT_APP);\r
+                break;\r
+            }\r
+            case android.R.id.home: {\r
+                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
+                    onBackPressed(); \r
+                }\r
+                break;\r
+            }\r
+            default:\r
+                retval = false;\r

         }\r
         }\r

+        return retval;\r
+    }\r

 \r
 \r

-        case android.R.id.home: {\r
-            Intent i = new Intent(this, AccountSelectActivity.class);\r
-            startActivity(i);\r
-            finish();\r
-            break;\r
+    @Override\r
+    public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
+        int i = itemPosition;\r
+        while (i-- != 0) {\r
+            onBackPressed();\r

         }\r
         }\r

-        default:\r
-            retval = false;\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
+                Uri selectedImageUri = data.getData();\r
+    \r
+                String filemanagerstring = selectedImageUri.getPath();\r
+                String selectedImagePath = getPath(selectedImageUri);\r
+                String filepath;\r
+    \r
+                if (selectedImagePath != null)\r
+                    filepath = selectedImagePath;\r
+                else\r
+                    filepath = filemanagerstring;\r
+    \r
+                if (filepath == null) {\r
+                    Log.e("FileDisplay", "Couldnt resolve path to file");\r
+                    return;\r
+                }\r
+    \r
+                Intent i = new Intent(this, FileUploader.class);\r
+                i.putExtra(FileUploader.KEY_ACCOUNT,\r
+                        AccountUtils.getCurrentOwnCloudAccount(this));\r
+                String remotepath = new String();\r
+                for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
+                    remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j));\r
+                }\r
+                if (!remotepath.endsWith("/"))\r
+                    remotepath += "/";\r
+                remotepath += URLEncoder.encode(new File(filepath).getName());\r
+    \r
+                i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
+                i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
+                i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
+                startService(i);\r
+            }\r

         }\r
         }\r

-        return retval;\r

     }\r
 \r
     @Override\r
     public void onBackPressed() {\r
     }\r
 \r
     @Override\r
     public void onBackPressed() {\r

-        if (mDirectories.getCount() == 1) {\r
+        if (mDirectories == null || mDirectories.getCount() <= 1) {\r

             finish();\r
             return;\r
         }\r
             finish();\r
             return;\r
         }\r

-        popPath();\r
-        ((FileListFragment) getSupportFragmentManager().findFragmentById(\r
-                R.id.fileList)).onNavigateUp();\r
-    }\r
-\r
-    @Override\r
-    public boolean onCreateOptionsMenu(Menu menu) {\r
-        MenuInflater inflater = getSherlock().getMenuInflater();\r
-        inflater.inflate(R.menu.menu, menu);\r
-        return true;\r
+        popDirname();\r
+        mFileList.onNavigateUp();\r
+        mCurrentDir = mFileList.getCurrentFile();\r
+        \r
+        if(mCurrentDir.getParentId() == 0){\r
+            ActionBar actionBar = getSupportActionBar(); \r
+            actionBar.setDisplayHomeAsUpEnabled(false);\r
+        } \r

     }\r
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
     }\r
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r

+        Log.e("ASD", "restore");\r

         super.onRestoreInstanceState(savedInstanceState);\r
         super.onRestoreInstanceState(savedInstanceState);\r

-        // Check, if there are ownCloud accounts\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
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories.add("/");\r
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r

+        mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r

     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r

+        Log.e("ASD", "save " + (mCurrentDir != null ? mCurrentDir.getFileName() : "NULL"));\r

         super.onSaveInstanceState(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 && mDirectories.getCount() != 0){\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

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

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

-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-            return;\r
-        }\r
-\r
-        IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
-        syncBroadcastRevceiver = new SyncBroadcastReceiver();\r
-        registerReceiver(syncBroadcastRevceiver, f);\r
-\r
-        mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
-        mDirectories.add("/");\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.populateFileList();\r
-        }\r
-\r
-        mStorageManager = new FileDataStorageManager(\r
-                AccountUtils.getCurrentOwnCloudAccount(this),\r
-                getContentResolver());\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
-\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

 \r
 \r

-                String filemanagerstring = selectedImageUri.getPath();\r
-                String selectedImagePath = getPath(selectedImageUri);\r
-                String filepath;\r
+        if (accountsAreSetup()) {\r

 \r
 \r

-                if (selectedImagePath != null)\r
-                    filepath = selectedImagePath;\r
-                else\r
-                    filepath = filemanagerstring;\r
+            setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)\r

 \r
 \r

-                if (filepath == null) {\r
-                    Log.e("FileDisplay", "Couldnt resolve path to file");\r
-                    return;\r
+            // Listen for sync messages\r
+            IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
+            syncBroadcastRevceiver = new SyncBroadcastReceiver();\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 != null && !mCurrentDir.isDirectory()){\r
+                    mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r

                 }\r
                 }\r

-\r
-                Intent i = new Intent(this, FileUploader.class);\r
-                i.putExtra(FileUploader.KEY_ACCOUNT,\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
+            \r
+                // Clear intent extra, so rotating the screen will not return us to this directory\r
+                getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
+            } else {\r
+                mCurrentDir = mStorageManager.getFileByPath("/");\r
+            }\r
+                \r
+            // Drop-Down navigation and file list restore\r
+            mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\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

-                if (!remotepath.endsWith("/"))\r
-                    remotepath += "/";\r
-                remotepath += new File(filepath).getName();\r
-                Log.e("ASD", remotepath + "");\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
+                    mDirectories.add(s);\r
+            } else {\r
+                mDirectories.add("/");\r
+            }\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
+            if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
+                action_bar.setDisplayHomeAsUpEnabled(true);\r
+            } else {\r
+                action_bar.setDisplayHomeAsUpEnabled(false);\r
+            }\r
+        \r
+            // List dir here\r
+            mFileList.listDirectory(mCurrentDir);\r
+        }\r
+    }\r

 \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
-                startService(i);\r
+    @Override\r
+    protected void onPause() {\r
+        super.onPause();\r
+        if (syncBroadcastRevceiver != null) {\r
+            unregisterReceiver(syncBroadcastRevceiver);\r
+            syncBroadcastRevceiver = null;\r
+        }\r
+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+    }\r
+\r
+    @Override\r
+    protected Dialog onCreateDialog(int id) {\r
+        Dialog dialog = null;\r
+        AlertDialog.Builder builder;\r
+        switch (id) {\r
+        case DIALOG_SETUP_ACCOUNT:\r
+            builder = new AlertDialog.Builder(this);\r
+            builder.setTitle(R.string.main_tit_accsetup);\r
+            builder.setMessage(R.string.main_wrn_accsetup);\r
+            builder.setCancelable(false);\r
+            builder.setPositiveButton(android.R.string.ok, this);\r
+            builder.setNegativeButton(android.R.string.cancel, this);\r
+            dialog = builder.create();\r
+            break;\r
+        case DIALOG_ABOUT_APP: {\r
+            builder = new AlertDialog.Builder(this);\r
+            builder.setTitle("About");\r
+            PackageInfo pkg;\r
+            try {\r
+                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
+                builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName );\r
+                builder.setIcon(android.R.drawable.ic_menu_info_details);\r
+                dialog = builder.create();\r
+            } catch (NameNotFoundException e) {\r
+                builder = null;\r
+                dialog = null;\r
+                e.printStackTrace();\r

             }\r
             }\r

+            break;\r
+        }\r
+        case DIALOG_CREATE_DIR: {\r
+            builder = new Builder(this);\r
+            final EditText dirNameInput = new EditText(getBaseContext());\r
+            final Account a = AccountUtils.getCurrentOwnCloudAccount(this);\r
+            builder.setView(dirNameInput);\r
+            builder.setTitle(R.string.uploader_info_dirname);\r
+            int typed_color = getResources().getColor(R.color.setup_text_typed);\r
+            dirNameInput.setTextColor(typed_color);\r
+            builder.setPositiveButton(android.R.string.ok,\r
+                    new OnClickListener() {\r
+                        public void onClick(DialogInterface dialog, int which) {\r
+                            String directoryName = dirNameInput.getText().toString();\r
+                            if (directoryName.trim().length() == 0) {\r
+                                dialog.cancel();\r
+                                return;\r
+                            }\r
+    \r
+                            // Figure out the path where the dir needs to be created\r
+                            String path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
+                            \r
+                            // Create directory\r
+                            path += directoryName + "/";\r
+                            Thread thread = new Thread(new DirectoryCreator(path, a));\r
+                            thread.start();\r
+    \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
+                            // Display the new folder right away\r
+                            dialog.dismiss();\r
+                            mFileList.listDirectory(mCurrentDir);\r
+                        }\r
+                    });\r
+            builder.setNegativeButton(R.string.common_cancel,\r
+                    new OnClickListener() {\r
+                        public void onClick(DialogInterface dialog, int which) {\r
+                            dialog.cancel();\r
+                        }\r
+                    });\r
+            dialog = builder.create();\r
+            break;\r
+        }\r
+        default:\r
+            dialog = null;\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
+        switch (which) {\r
+        case DialogInterface.BUTTON_POSITIVE:\r
+            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
+            intent.putExtra("authorities",\r
+                    new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            startActivity(intent);\r
+            break;\r
+        case DialogInterface.BUTTON_NEGATIVE:\r
+            finish();\r

         }\r
         }\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


@@ -347,109 +486,96 @@ 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
-    @Override\r
-    protected void onPause() {\r
-        super.onPause();\r
-        if (syncBroadcastRevceiver != null) {\r
-            unregisterReceiver(syncBroadcastRevceiver);\r
-            syncBroadcastRevceiver = null;\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
         }\r

+        mDirectories.insert(directory.getFileName(), 0);\r
+        mCurrentDir = directory;\r
+    }\r

 \r
 \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
 \r
     }\r
 \r

-    @Override\r
-    public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
-        int i = itemPosition;\r
-        while (i-- != 0) {\r
-            onBackPressed();\r
-        }\r
-        return true;\r
+    /**\r
+     * Checks, whether or not there are any ownCloud accounts setup.\r
+     * \r
+     * @return true, if there is at least one account.\r
+     */\r
+    private boolean accountsAreSetup() {\r
+        AccountManager accMan = AccountManager.get(this);\r
+        Account[] accounts = accMan\r
+                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
+        return accounts.length > 0;\r

     }\r
 \r
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
         private AccountManager mAm;\r
     }\r
 \r
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
         private AccountManager mAm;\r

-\r
+    \r

         public DirectoryCreator(String targetPath, Account account) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r
             mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
         }\r
         public DirectoryCreator(String targetPath, Account account) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r
             mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
         }\r

-\r
+    \r

         @Override\r
         public void run() {\r
             WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(\r
                     mAccount, AccountAuthenticator.KEY_OC_URL)));\r
         @Override\r
         public void run() {\r
             WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(\r
                     mAccount, AccountAuthenticator.KEY_OC_URL)));\r

-\r
+    \r

             String username = mAccount.name.substring(0,\r
                     mAccount.name.lastIndexOf('@'));\r
             String password = mAm.getPassword(mAccount);\r
             String username = mAccount.name.substring(0,\r
                     mAccount.name.lastIndexOf('@'));\r
             String password = mAm.getPassword(mAccount);\r

-\r
+    \r

             wdc.setCredentials(username, password);\r
             wdc.setCredentials(username, password);\r

-            wdc.allowUnsignedCertificates();\r
+            wdc.allowSelfsignedCertificates();\r

             wdc.createDirectory(mTargetPath);\r
         }\r
             wdc.createDirectory(mTargetPath);\r
         }\r

-\r
+    \r

     }\r
 \r
     // Custom array adapter to override text colors\r
     private class CustomArrayAdapter<T> extends ArrayAdapter<T> {\r
     }\r
 \r
     // Custom array adapter to override text colors\r
     private class CustomArrayAdapter<T> extends ArrayAdapter<T> {\r

-\r
+    \r

         public CustomArrayAdapter(FileDisplayActivity ctx, int view) {\r
             super(ctx, view);\r
         }\r
         public CustomArrayAdapter(FileDisplayActivity ctx, int view) {\r
             super(ctx, view);\r
         }\r

-\r
+    \r

         public View getView(int position, View convertView, ViewGroup parent) {\r
             View v = super.getView(position, convertView, parent);\r
         public View getView(int position, View convertView, ViewGroup parent) {\r
             View v = super.getView(position, convertView, parent);\r

-\r
+    \r

             ((TextView) v).setTextColor(getResources().getColorStateList(\r
                     android.R.color.white));\r
             return v;\r
         }\r
             ((TextView) v).setTextColor(getResources().getColorStateList(\r
                     android.R.color.white));\r
             return v;\r
         }\r

-\r
+    \r

         public View getDropDownView(int position, View convertView,\r
                 ViewGroup parent) {\r
             View v = super.getDropDownView(position, convertView, parent);\r
         public View getDropDownView(int position, View convertView,\r
                 ViewGroup parent) {\r
             View v = super.getDropDownView(position, convertView, parent);\r

-\r
+    \r

             ((TextView) v).setTextColor(getResources().getColorStateList(\r
                     android.R.color.white));\r
             ((TextView) v).setTextColor(getResources().getColorStateList(\r
                     android.R.color.white));\r

-\r
+    \r

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

-\r
-    }\r
-\r
-    public void onClick(DialogInterface dialog, int which) {\r
-        // In any case - we won't need it anymore\r
-        dialog.dismiss();\r
-        switch (which) {\r
-        case DialogInterface.BUTTON_POSITIVE:\r
-            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
-            intent.putExtra("authorities",\r
-                    new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
-            startActivity(intent);\r
-            break;\r
-        case DialogInterface.BUTTON_NEGATIVE:\r
-            finish();\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * Checks, whether or not there are any ownCloud accounts setup.\r
-     * \r
-     * @return true, if there is at least one account.\r
-     */\r
-    private boolean accountsAreSetup() {\r
-        AccountManager accMan = AccountManager.get(this);\r
-        Account[] accounts = accMan\r
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
-        return accounts.length > 0;\r
+    \r

     }\r
 \r
     private class SyncBroadcastReceiver extends BroadcastReceiver {\r
     }\r
 \r
     private class SyncBroadcastReceiver extends BroadcastReceiver {\r


@@ -469,10 +595,22 @@ 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
         }\r
 \r
     }\r
 \r

+    @Override\r
+    public void onClick(View v) {\r
+        if (v.getId() == R.id.setup_account) {\r
+            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
+            intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            startActivity(intent);\r
+        }\r
+    }\r
+\r
+    public DataStorageManager getStorageManager() {\r
+        return mStorageManager;\r
+    }    \r

 }\r
 }\r