Small fixes on delete

[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 93d0ab7..07ca6f5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -19,365 +19,661 @@
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 import java.io.File;\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 import java.io.File;\r

-import java.io.FileInputStream;\r
-import java.io.FileNotFoundException;\r
-import java.io.IOException;\r
-import java.util.LinkedList;\r
-import java.util.Stack;\r
+import java.util.ArrayList;\r

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

+import android.app.AlertDialog.Builder;\r

 import android.app.Dialog;\r
 import android.app.Dialog;\r

-import android.app.ListActivity;\r
-import android.app.ActionBar.OnNavigationListener;\r
+import android.content.BroadcastReceiver;\r
+import android.content.ContentResolver;\r
+import android.content.Context;\r

 import android.content.DialogInterface;\r
 import android.content.DialogInterface;\r

+import android.content.DialogInterface.OnClickListener;\r

 import android.content.Intent;\r
 import android.content.Intent;\r

-import android.content.DialogInterface.OnCancelListener;\r
-import android.content.res.Configuration;\r
+import android.content.IntentFilter;\r
+import android.content.pm.PackageInfo;\r
+import android.content.pm.PackageManager.NameNotFoundException;\r

 import android.database.Cursor;\r
 import android.database.Cursor;\r

-import android.database.DataSetObserver;\r
-import android.graphics.Bitmap;\r
-import android.graphics.BitmapFactory;\r
-import android.graphics.Matrix;\r
-import android.graphics.drawable.Drawable;\r

 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r

-import android.os.Environment;\r
-import android.support.v4.app.FragmentActivity;\r
-import android.support.v4.app.FragmentTransaction;\r
-import android.support.v4.view.Menu;\r
-import android.support.v4.view.MenuItem;\r
-import android.text.TextUtils;\r
+import android.provider.MediaStore;\r

 import android.util.Log;\r
 import android.util.Log;\r

-import android.view.MenuInflater;\r

 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r

-import android.view.Window;\r

 import android.widget.ArrayAdapter;\r
 import android.widget.ArrayAdapter;\r

-import android.widget.ImageView;\r
-import android.widget.ListView;\r
-import android.widget.Spinner;\r
-import android.widget.SpinnerAdapter;\r
+import android.widget.EditText;\r

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

+import android.widget.Toast;\r
+\r
+import com.actionbarsherlock.app.ActionBar;\r
+import com.actionbarsherlock.app.ActionBar.OnNavigationListener;\r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
+import com.actionbarsherlock.view.Menu;\r
+import com.actionbarsherlock.view.MenuInflater;\r
+import com.actionbarsherlock.view.MenuItem;\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.R;\r

-import eu.alefzero.owncloud.R.id;\r
-import eu.alefzero.owncloud.R.layout;\r
-import eu.alefzero.owncloud.R.menu;\r
-import eu.alefzero.owncloud.R.string;\r

 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

-import eu.alefzero.owncloud.db.DbHandler;\r
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
-import eu.alefzero.owncloud.ui.fragment.FileDetail;\r
-import eu.alefzero.owncloud.ui.fragment.FileList;\r
-import eu.alefzero.owncloud.ui.fragment.ActionBar;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.OCFile;\r
+import eu.alefzero.owncloud.files.services.FileDownloader;\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
 /**\r
  * Displays, what files the user has available in his ownCloud.\r
 \r
 /**\r
  * Displays, what files the user has available in his ownCloud.\r

+ * \r

  * @author Bartek Przybylski\r
  * @author Bartek Przybylski\r

- *\r
+ * \r

  */\r
 \r
  */\r
 \r

-public class FileDisplayActivity extends android.support.v4.app.FragmentActivity implements OnNavigationListener {\r
-  private DbHandler mDBHandler;\r
-  private Stack<String> mParents;\r
-  private LinkedList<String> mPath;\r
-  private Account mAccount;\r
-  private Cursor mCursor;\r
-  private boolean mIsDisplayingFile;\r
-  private ArrayAdapter<String> mDirectories;\r
- \r
-  private static final int DIALOG_CHOOSE_ACCOUNT = 0;\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
-    Log.d("TAG", ""+getActionBar().getCustomView());\r
-    return !mDirectories.isEmpty();\r
-  }\r
-  \r
-  @Override\r
-  public void onCreate(Bundle savedInstanceState) {\r
-    super.onCreate(savedInstanceState);\r
-    mDirectories = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item);\r
-    mDirectories.add("/");\r
-    setContentView(R.layout.files);\r
-    getActionBar().setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST);\r
-    getActionBar().setDisplayShowTitleEnabled(false);\r
-    getActionBar().setListNavigationCallbacks(mDirectories, this);\r
-    \r
-    FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
-    ft.add(R.id.file_list_container, new FileList());\r
-    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
-      ft.add(R.id.fileDetail, new FileDetail());\r
+public class FileDisplayActivity extends SherlockFragmentActivity implements\r
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {\r
+    \r
+    private ArrayAdapter<String> mDirectories;\r
+    private OCFile mCurrentDir;\r
+    private String[] mDirs = null;\r
+\r
+    private DataStorageManager mStorageManager;\r
+    private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
+    private UploadFinishReceiver mUploadFinishReceiver;\r
+    \r
+    private View mLayoutView = null;\r
+    private FileListFragment mFileList;\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
+    private static final int DIALOG_ABOUT_APP = 2;\r
+    \r
+    private static final int ACTION_SELECT_FILE = 1;\r
+    //private static final int ACTION_CREATE_FIRST_ACCOUNT = 2; dvelasco: WIP\r
+\r
+    @Override\r
+    public void onCreate(Bundle savedInstanceState) {\r
+        Log.i(getClass().toString(), "onCreate() start");\r
+        super.onCreate(savedInstanceState);\r
+\r
+        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
+        setSupportProgressBarIndeterminateVisibility(false);\r
+\r
+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
+\r
+        if(savedInstanceState != null){\r
+            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);   // this is never saved with this key :S\r
+        }\r
+        \r
+        mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
+        \r
+        if (AccountUtils.accountsAreSetup(this)) {\r
+            setContentView(mLayoutView);    \r
+            \r
+        } else  {\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
+        \r
+        Log.i(getClass().toString(), "onCreate() end");\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

     }\r
     }\r

-    ft.commit();\r
-\r
-    /*getSupportFragmentManager().beginTransaction().add(arg0, arg1);\r
-    FileList fl = new FileList();\r
-    ft.add(R.id.fileList, fl);\r
-    ft.commit();\r
-    /*\r
-\r
-    \r
-    if (savedInstanceState != null) {\r
-      mParents = (Stack<String>)savedInstanceState.getSerializable("parentsStack");\r
-      mIsDisplayingFile = savedInstanceState.getBoolean("isDisplayingFile");\r
-      mPath = (LinkedList<String>)savedInstanceState.getSerializable("path");\r
-    } else {\r
-      mParents = new Stack<String>();\r
-      mPath = new LinkedList<String>();\r
-      mIsDisplayingFile = false;\r
+\r
+    @Override\r
+    public boolean onOptionsItemSelected(MenuItem item) {\r
+        boolean retval = true;\r
+        switch (item.getItemId()) {\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
+        return retval;\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
 \r
     }\r
 \r

-    mDBHandler = new DbHandler(getBaseContext());\r
-    requestWindowFeature(Window.FEATURE_NO_TITLE);\r
-    setContentView(R.layout.main);\r
-\r
-    AccountManager accMan = AccountManager.get(this);\r
-    Account[] accounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
-\r
-    if (accounts.length == 0) {\r
-      // using string value since in API7 this constatn is not defined\r
-      // in API7 < this constatant is defined in Settings.ADD_ACCOUNT_SETTINGS\r
-      // and Settings.EXTRA_AUTHORITIES\r
-      Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
-      intent.putExtra("authorities", new String[] {AccountAuthenticator.AUTH_TOKEN_TYPE});\r
-      startActivity(intent);\r
-    } else if (accounts.length > 1) {\r
-      showDialog(DIALOG_CHOOSE_ACCOUNT);\r
-    } else {\r
-      mAccount = accounts[0];\r
-      populateFileList();\r
-    }*/\r
-  }\r
-\r
-  @Override\r
-  public boolean onOptionsItemSelected(MenuItem item) {\r
-    switch (item.getItemId()) {\r
-      case R.id.settingsItem :\r
-        Intent i = new Intent(this, Preferences.class);\r
-        startActivity(i);\r
-        break;\r
+    /**\r
+     * Called, when the user selected something for uploading\r
+     */\r
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
+        if (requestCode == ACTION_SELECT_FILE) {\r
+            if (resultCode == RESULT_OK) {\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 += "/" + mDirectories.getItem(j);\r
+                }\r
+                if (!remotepath.endsWith("/"))\r
+                    remotepath += "/";\r
+                remotepath += new File(filepath).getName();\r
+                remotepath = Uri.encode(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, FileUploader.UPLOAD_SINGLE_FILE);\r
+                startService(i);\r
+            }\r
+            \r
+        }/* dvelasco: WIP - not working as expected ... yet :)\r
+             else if (requestCode == ACTION_CREATE_FIRST_ACCOUNT) {\r
+            if (resultCode != RESULT_OK) {\r
+                finish();   // the user cancelled the AuthenticatorActivity\r
+            }\r
+        }*/\r

     }\r
     }\r

-    return true;\r
-  }\r
-\r
-  @Override\r
-  protected Dialog onCreateDialog(int id) {\r
-    switch (id) {\r
-      case DIALOG_CHOOSE_ACCOUNT:\r
-        return createChooseAccountDialog();\r
-      default:\r
-        throw new IllegalArgumentException("Unknown dialog id: " + id);\r
+\r
+    @Override\r
+    public void onBackPressed() {\r
+        if (mDirectories == null || mDirectories.getCount() <= 1) {\r
+            finish();\r
+            return;\r
+        }\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

-  }\r
-  \r
-  @Override\r
-  public boolean onCreateOptionsMenu(Menu menu) {\r
-    MenuInflater inflater = getMenuInflater();\r
-    inflater.inflate(R.menu.menu, menu);\r
-    return true;\r
-  }\r
-    \r
-  private Dialog createChooseAccountDialog() {\r
-    final AccountManager accMan = AccountManager.get(this);\r
-    CharSequence[] items = new CharSequence[accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];\r
-    int i = 0;\r
-    for (Account a : accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)) {\r
-      items[i++] = a.name;\r
+\r
+    @Override\r
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
+        Log.i(getClass().toString(), "onRestoreInstanceState() start");\r
+        super.onRestoreInstanceState(savedInstanceState);\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
+        mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
+        Log.i(getClass().toString(), "onRestoreInstanceState() end");\r

     }\r
     \r
     }\r
     \r

-    AlertDialog.Builder builder = new AlertDialog.Builder(this);\r
-    builder.setTitle(R.string.common_choose_account);\r
-    builder.setCancelable(true);\r
-    builder.setItems(items, new DialogInterface.OnClickListener() {\r
-        public void onClick(DialogInterface dialog, int item) {\r
-            mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r
-            dialog.dismiss();\r
+    @Override\r
+    protected void onSaveInstanceState(Bundle outState) {\r
+        Log.i(getClass().toString(), "onSaveInstanceState() start");\r
+        super.onSaveInstanceState(outState);\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

-    });\r
-    builder.setOnCancelListener(new OnCancelListener() {\r
-      public void onCancel(DialogInterface dialog) {\r
-        FileDisplayActivity.this.finish();\r
-      }\r
-    });\r
-    AlertDialog alert = builder.create();\r
-    return alert;\r
-  }\r
-\r
-  //@Override\r
-  //public void onBackPressed() {\r
-    /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-    if (mIsDisplayingFile) {\r
-      mIsDisplayingFile = false;\r
-      setContentView(R.layout.main);\r
-      pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-      Uri uri;\r
-      if (mParents.empty()) {\r
-        uri = ProviderTableMeta.CONTENT_URI;\r
-      } else {\r
-        uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek());\r
-      }\r
-      mCursor = managedQuery(uri,\r
-                             null,\r
-                             ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-                             new String[]{mAccount.name}, null);\r
-  \r
-      if (mCursor.moveToFirst()) {\r
-        String s = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_PATH));\r
-        for (String str : s.split("/")) {\r
-          if (!TextUtils.isEmpty(str))\r
-            pl.push(DisplayUtils.HtmlDecode(str));\r
+        outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
+        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        Log.i(getClass().toString(), "onSaveInstanceState() end");\r
+    }\r
+\r
+    @Override\r
+    protected void onResume() {\r
+        Log.i(getClass().toString(), "onResume() start");\r
+        super.onResume();\r
+\r
+        if (!AccountUtils.accountsAreSetup(this)) {\r
+            /*Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
+            intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            //startActivity(intent);\r
+            startActivityForResult(intent, ACTION_CREATE_FIRST_ACCOUNT);*/\r
+            \r
+        } else {    // at least an account exist: normal operation\r
+\r
+            // set the layout only if it couldn't be set in onCreate\r
+            if (findViewById(R.id.file_list_view) == null)\r
+                setContentView(mLayoutView);\r
+\r
+            // Listen for sync messages\r
+            IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
+            mSyncBroadcastReceiver = new SyncBroadcastReceiver();\r
+            registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);\r
+            \r
+            // Listen for upload messages\r
+            IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);\r
+            mUploadFinishReceiver = new UploadFinishReceiver();\r
+            registerReceiver(mUploadFinishReceiver, uploadIntentFilter);\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
+                // Clear intent extra, so rotating the screen will not return us to this directory\r
+                getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
+            }\r
+            \r
+            if (mCurrentDir == null)\r
+                mCurrentDir = mStorageManager.getFileByPath("/");\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
+                // 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
-      getListView().setAdapter(new FileListListAdapter(mCursor, this));      \r
-      getListView().invalidate();\r
-      return;\r
+        Log.i(getClass().toString(), "onResume() end");\r

     }\r
     }\r

-    if (mParents.size()==0) {\r
-      super.onBackPressed();\r
-      return;\r
-    } else if (mParents.size() == 1) {\r
-      mParents.pop();\r
-      mPath.removeLast();\r
-      pl.pop();\r
-      mCursor = managedQuery(ProviderTableMeta.CONTENT_URI,\r
-          null,\r
-          ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-          new String[]{mAccount.name},\r
-          null);\r
-    } else {\r
-      mParents.pop();\r
-      mPath.removeLast();\r
-      pl.pop();\r
-      mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek()),\r
-          null,\r
-          ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-          new String[]{mAccount.name},\r
-          null);\r
+\r
+    @Override\r
+    protected void onPause() {\r
+        Log.i(getClass().toString(), "onPause() start");\r
+        super.onPause();\r
+        if (mSyncBroadcastReceiver != null) {\r
+            unregisterReceiver(mSyncBroadcastReceiver);\r
+            mSyncBroadcastReceiver = null;\r
+        }\r
+        if (mUploadFinishReceiver != null) {\r
+            unregisterReceiver(mUploadFinishReceiver);\r
+            mUploadFinishReceiver = null;\r
+        }\r
+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        Log.i(getClass().toString(), "onPause() end");\r

     }\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
+            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;\r
+                            if (mCurrentDir == null) {\r
+                                // this is just a patch; we should ensure that mCurrentDir never is null\r
+                                if (!mStorageManager.fileExists("/")) {\r
+                                    OCFile file = new OCFile("/");\r
+                                    mStorageManager.saveFile(file);\r
+                                }\r
+                                mCurrentDir = mStorageManager.getFileByPath("/");\r
+                            }\r
+                            path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
+                            \r
+                            // Create directory\r
+                            path += Uri.encode(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
     \r

-    setListAdapter(new FileListListAdapter(mCursor, this));\r
-    getListView().invalidate();*/\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

-  //@Override\r
-/*  protected void onListItemClick(ListView l, View v, int position, long id) {\r
-    super.onListItemClick(l, v, position, id);\r
-    /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-    if (!mCursor.moveToPosition(position)) {\r
-      throw new IndexOutOfBoundsException("Incorrect item selected");\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

-    if (!mIsDisplayingFile) {\r
-      if (mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) {\r
-        String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
-        String dirname = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
-        pl.push(DisplayUtils.HtmlDecode(dirname));\r
-        mPath.addLast(DisplayUtils.HtmlDecode(dirname));\r
-        mParents.push(id_);\r
-        mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, id_),\r
-                               null,\r
-                               ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
-                               new String[]{mAccount.name}, null);\r
-        setListAdapter(new FileListListAdapter(mCursor, this));\r
-      } else {\r
-        mIsDisplayingFile = true;\r
-        setContentView(R.layout.file_display);\r
-        String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
-        mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, id_),\r
-                               null,\r
-                               null,\r
-                               null,\r
-                               null);\r
-        mCursor.moveToFirst();\r
-        // filename\r
-        TextView tv = (TextView) findViewById(R.id.textView1);\r
-        tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)));\r
-        // filetype\r
-        tv = (TextView) findViewById(R.id.textView2);\r
-        tv.setText(DisplayUtils.convertMIMEtoPrettyPrint(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE))));\r
-        // size\r
-        tv = (TextView) findViewById(R.id.textView3);\r
-        tv.setText(DisplayUtils.bitsToHumanReadable(mCursor.getLong(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH))));\r
-        // modified\r
-        tv = (TextView) findViewById(R.id.textView4);\r
-        tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_MODIFIED)));\r
-        if (!TextUtils.isEmpty(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH))) &&\r
-            mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).matches("image/*")) {\r
-          ImageView iv = (ImageView) findViewById(R.id.imageView1);\r
-          Bitmap bmp = BitmapFactory.decodeFile(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH)));\r
-          Matrix m = new Matrix();\r
-          float scale;\r
-          if (bmp.getWidth() > bmp.getHeight()) {\r
-            scale = (float) (200./bmp.getWidth());\r
-          } else {\r
-            scale = (float) (200./bmp.getHeight());\r
-          }\r
-          m.postScale(scale, scale);\r
-          Bitmap newBmp = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), m, true);\r
-          iv.setImageBitmap(newBmp);\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
+        if (cursor != null) {\r
+            int column_index = cursor\r
+                    .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);\r
+            cursor.moveToFirst();\r
+            return cursor.getString(column_index);\r
+        } \r
+        return null;\r
+    }\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

-        setListAdapter(new FileListActionListAdapter(mCursor, this, mAccount));\r
-      }    \r
-      getListView().invalidate();\r
-    } else {\r
-        Intent i = (Intent) getListAdapter().getItem(position);\r
-        if (i.hasExtra("toDownload")) {\r
-          \r
-          Intent intent = new Intent(this, FileDownloader.class);\r
-          intent.putExtra(FileDownloader.EXTRA_FILE_PATH, "/"+((TextView)findViewById(R.id.textView1)).getText().toString());\r
-          intent.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
-          startService(intent);\r
-          /*\r
-          if (i.getBooleanExtra("toDownload", false)) {\r
-            startActivityForResult(i, 200);\r
-          } else {\r
-            startActivity(i);            \r
-          }*/\r
-       // }\r
-\r
-    //}\r
-//  }\r
-  \r
- \r
-//    setListAdapter(new FileListListAdapter(mCursor, this));\r
-//    getListView().invalidate();\r
-\r
-  @Override\r
-  public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
-    int i = itemPosition;\r
-    while (i-- != 0) {\r
-      popPath();\r
-      //mFileList.onBackPressed();\r
+        mDirectories.insert(directory.getFileName(), 0);\r
+        mCurrentDir = directory;\r

     }\r
     }\r

-    return true;\r
-  }\r
-  \r
-  @Override\r
-  public void onBackPressed() {\r
-    popPath();\r
-    if (mDirectories.getCount() == 0)\r
-    {\r
-      super.onBackPressed();\r
-      return;\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
+    private class DirectoryCreator implements Runnable {\r
+        private String mTargetPath;\r
+        private Account mAccount;\r
+        private AccountManager mAm;\r
+    \r
+        public DirectoryCreator(String targetPath, Account account) {\r
+            mTargetPath = targetPath;\r
+            mAccount = account;\r
+            mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
+        }\r
+    \r
+        @Override\r
+        public void run() {\r
+            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r
+    \r
+            String username = mAccount.name.substring(0,\r
+                    mAccount.name.lastIndexOf('@'));\r
+            String password = mAm.getPassword(mAccount);\r
+    \r
+            wdc.setCredentials(username, password);\r
+            wdc.allowSelfsignedCertificates();\r
+            wdc.createDirectory(mTargetPath);\r
+        }\r
+    \r

     }\r
     }\r

-    ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();\r
-  }\r
-  \r
-  //@Override\r
-  /*protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
-    super.onActivityResult(requestCode, resultCode, data);\r
-  }\r
-  \r
-  @Override\r
-  protected void onSaveInstanceState(Bundle outState) {\r
-    super.onSaveInstanceState(outState);\r
-    outState.putSerializable("parentsStack", mParents);\r
-    outState.putSerializable("path", mPath);\r
-    outState.putBoolean("isDisplayingFile", mIsDisplayingFile);\r
-  }*/\r
-}
\ No newline at end of file
+\r
+    // Custom array adapter to override text colors\r
+    private class CustomArrayAdapter<T> extends ArrayAdapter<T> {\r
+    \r
+        public CustomArrayAdapter(FileDisplayActivity ctx, int view) {\r
+            super(ctx, view);\r
+        }\r
+    \r
+        public View getView(int position, View convertView, ViewGroup parent) {\r
+            View v = super.getView(position, convertView, parent);\r
+    \r
+            ((TextView) v).setTextColor(getResources().getColorStateList(\r
+                    android.R.color.white));\r
+            return v;\r
+        }\r
+    \r
+        public View getDropDownView(int position, View convertView,\r
+                ViewGroup parent) {\r
+            View v = super.getDropDownView(position, convertView, parent);\r
+    \r
+            ((TextView) v).setTextColor(getResources().getColorStateList(\r
+                    android.R.color.white));\r
+    \r
+            return v;\r
+        }\r
+    \r
+    }\r
+\r
+    private class SyncBroadcastReceiver extends BroadcastReceiver {\r
+        /**\r
+         * {@link BroadcastReceiver} to enable syncing feedback in UI\r
+         */\r
+        @Override\r
+        public void onReceive(Context context, Intent intent) {\r
+            boolean inProgress = intent.getBooleanExtra(\r
+                    FileSyncService.IN_PROGRESS, false);\r
+            String account_name = intent\r
+                    .getStringExtra(FileSyncService.ACCOUNT_NAME);\r
+            Log.d("FileDisplay", "sync of account " + account_name\r
+                    + " is in_progress: " + inProgress);\r
+            setSupportProgressBarIndeterminateVisibility(inProgress);\r
+            \r
+            long OCDirId = intent.getLongExtra(FileSyncService.SYNC_FOLDER, -1);\r
+            if (OCDirId > 0) {\r
+                OCFile syncDir = mStorageManager.getFileById(OCDirId);\r
+                if (syncDir != null && (\r
+                        (mCurrentDir == null && syncDir.getFileName().equals("/")) ||\r
+                         syncDir.equals(mCurrentDir))\r
+                    ) {\r
+                    FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+                    if (fileListFragment != null) { \r
+                        fileListFragment.listDirectory();\r
+                    }\r
+                }\r
+            }\r
+            \r
+            if (!inProgress) {\r
+                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
+                        .findFragmentById(R.id.fileList);\r
+                if (fileListFragment != null)\r
+                    fileListFragment.listDirectory();\r
+            }\r
+        }\r
+\r
+    }\r
+    \r
+\r
+    private class UploadFinishReceiver extends BroadcastReceiver {\r
+        /**\r
+         * Once the file upload has finished -> update view\r
+         *  @author David A. Velasco\r
+         * {@link BroadcastReceiver} to enable upload feedback in UI\r
+         */\r
+        @Override\r
+        public void onReceive(Context context, Intent intent) {\r
+            long parentDirId = intent.getLongExtra(FileUploader.EXTRA_PARENT_DIR_ID, -1);\r
+            OCFile parentDir = mStorageManager.getFileById(parentDirId);\r
+            \r
+            if (parentDir != null && (\r
+                    (mCurrentDir == null && parentDir.getFileName().equals("/")) ||\r
+                     parentDir.equals(mCurrentDir))\r
+                ) {\r
+                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+                if (fileListFragment != null) { \r
+                    fileListFragment.listDirectory();\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