Testing synchronization cancelation

[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 fb3106c..7e62084 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -19,8 +19,7 @@
 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.net.URLDecoder;\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,10 +33,15 @@ 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.SharedPreferences;\r
+import android.content.pm.PackageInfo;\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.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r

+import android.preference.PreferenceManager;\r

 import android.provider.MediaStore;\r
 import android.provider.MediaStore;\r

+import android.support.v4.app.FragmentTransaction;\r

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


@@ -54,13 +58,16 @@ 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.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\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.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.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


@@ -72,40 +79,86 @@ 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
+    FileListFragment.ContainerActivity, OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {\r
+    \r

     private ArrayAdapter<String> mDirectories;\r
     private ArrayAdapter<String> mDirectories;\r

-    private DataStorageManager mStorageManager;\r
+    private OCFile mCurrentDir;\r

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

-    private SyncBroadcastReceiver syncBroadcastRevceiver;\r
-\r
-    private static final String KEY_DIR = "DIR";\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 boolean mDualPane;\r
+    \r
+    private boolean mForcedLoginToCreateFirstAccount = false;\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

+    private static final int DIALOG_ABOUT_APP = 2;\r
+    \r

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

-\r
+    \r

     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r

+        Log.i(getClass().toString(), "onCreate() start");\r

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

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

         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r

-        setProgressBarIndeterminateVisibility(false);\r
-        \r
-        setContentView(R.layout.files);\r

 \r
 \r

+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
+\r
+        if(savedInstanceState != null) {\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
+        }\r
+        \r
+        mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
+        \r
+        if (AccountUtils.accountsAreSetup(this)) {\r
+            \r
+            initDelayedTilAccountAvailabe();\r
+            \r
+            // PIN CODE request ;  best location is to decide, let's try this first\r
+            //if (savedInstanceState == null) {\r
+            if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
+                requestPinCode();\r
+            }\r
+            \r
+            \r
+        } else {\r
+            \r
+            setContentView(R.layout.no_account_available);\r
+            getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
+            findViewById(R.id.setup_account).setOnClickListener(this);\r
+\r
+            setSupportProgressBarIndeterminateVisibility(false);\r
+\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);  // although the code is here, the activity won't be created until this.onStart() and this.onResume() are finished;\r
+            mForcedLoginToCreateFirstAccount = true;\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
     }\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
+            inflater.inflate(R.menu.menu, menu);\r
+            return true;\r

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


@@ -117,6 +170,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;\r
             }\r
             case R.id.startSync: {\r
                 break;\r
             }\r
             case R.id.startSync: {\r

+                // This could be interesting\r
+                //ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any other ownCloud account\r

                 Bundle bundle = new Bundle();\r
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
                 ContentResolver.requestSync(\r
                 Bundle bundle = new Bundle();\r
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
                 ContentResolver.requestSync(\r


@@ -133,11 +188,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         ACTION_SELECT_FILE);\r
                 break;\r
             }\r
                         ACTION_SELECT_FILE);\r
                 break;\r
             }\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
             case android.R.id.home: {\r

-                Intent i = new Intent(this, AccountSelectActivity.class);\r
-                startActivity(i);\r
-                finish();\r
+                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
+                    onBackPressed(); \r
+                }\r

                 break;\r
             }\r
             default:\r
                 break;\r
             }\r
             default:\r


@@ -155,9 +218,12 @@ 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
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r

-        if (resultCode == RESULT_OK) {\r
-            if (requestCode == ACTION_SELECT_FILE) {\r
+        if (requestCode == ACTION_SELECT_FILE) {\r
+            if (resultCode == RESULT_OK) {\r

                 Uri selectedImageUri = data.getData();\r
     \r
                 String filemanagerstring = selectedImageUri.getPath();\r
                 Uri selectedImageUri = data.getData();\r
     \r
                 String filemanagerstring = selectedImageUri.getPath();\r


@@ -179,103 +245,170 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         AccountUtils.getCurrentOwnCloudAccount(this));\r
                 String remotepath = new String();\r
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\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
+                    remotepath += "/" + mDirectories.getItem(j);\r

                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r
                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r

-                remotepath += URLEncoder.encode(new File(filepath).getName());\r
-                Log.e("ASD", 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
                 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
+        }/* 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
     @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
+        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
     }\r
 \r
     @Override\r

-    protected void onRestoreInstanceState(Bundle 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
-        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
-    }\r
-    \r
-    @Override\r

     protected void onSaveInstanceState(Bundle outState) {\r
     protected void onSaveInstanceState(Bundle outState) {\r

+        // responsability of restore is prefered in onCreate() before than in onRestoreInstanceState when there are Fragments involved\r
+        Log.i(getClass().toString(), "onSaveInstanceState() start");\r

         super.onSaveInstanceState(outState);\r
         super.onSaveInstanceState(outState);\r

-        if(mDirectories != null){\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
             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

+        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
     }\r
 \r
     @Override\r
     protected void onResume() {\r

+        Log.i(getClass().toString(), "onResume() start");\r

         super.onResume();\r
         super.onResume();\r

-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-            return;\r
-        }\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.listDirectory();\r
-        }\r
+        if (AccountUtils.accountsAreSetup(this)) {\r
+         // at least an account exist: normal operation\r
+            \r
+            // set the layout only if it couldn't be set in onCreate\r
+            if (mForcedLoginToCreateFirstAccount) {\r
+                initDelayedTilAccountAvailabe();\r
+                mForcedLoginToCreateFirstAccount = false;\r
+            }\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
+            // 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 fragments   \r
+            mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+            \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
+        Log.i(getClass().toString(), "onResume() end");\r

     }\r
 \r
     @Override\r
     protected void onPause() {\r
     }\r
 \r
     @Override\r
     protected void onPause() {\r

+        Log.i(getClass().toString(), "onPause() start");\r

         super.onPause();\r
         super.onPause();\r

-        if (syncBroadcastRevceiver != null) {\r
-            unregisterReceiver(syncBroadcastRevceiver);\r
-            syncBroadcastRevceiver = null;\r
+        if (mSyncBroadcastReceiver != null) {\r
+            unregisterReceiver(mSyncBroadcastReceiver);\r
+            mSyncBroadcastReceiver = null;\r

         }\r
         }\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
     @Override\r
     protected Dialog onCreateDialog(int id) {\r
     }\r
 \r
     @Override\r
     protected Dialog onCreateDialog(int id) {\r

-        Dialog dialog;\r
+        Dialog dialog = null;\r

         AlertDialog.Builder builder;\r
         switch (id) {\r
         case DIALOG_SETUP_ACCOUNT:\r
         AlertDialog.Builder builder;\r
         switch (id) {\r
         case DIALOG_SETUP_ACCOUNT:\r


@@ -287,41 +420,65 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setNegativeButton(android.R.string.cancel, this);\r
             dialog = builder.create();\r
             break;\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
         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
-    \r
+            dirNameInput.setTextColor(typed_color);\r

             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\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
+                            // 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
                             }\r

-                            OCFile parent = mStorageManager.getFileByPath(path\r
-                                    + "/");\r
-                            path += s + "/";\r
-                            Thread thread = new Thread(new DirectoryCreator(\r
-                                    path, a));\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
                             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 +497,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 +519,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,29 +533,30 @@ 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
-\r
-    public void pushPath(String path) {\r
-        mDirectories.insert(path, 0);\r
+        } \r
+        return null;\r

     }\r
     }\r

-\r
-    public boolean popPath() {\r
-        mDirectories.remove(mDirectories.getItem(0));\r
-        return !mDirectories.isEmpty();\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
 \r
     /**\r

-     * Checks, whether or not there are any ownCloud accounts setup.\r
-     * \r
-     * @return true, if there is at least one account.\r
+     * Pops a directory name from the drop down list\r
+     * @return True, unless the stack is empty\r

      */\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
+    public boolean popDirname() {\r
+        mDirectories.remove(mDirectories.getItem(0));\r
+        return !mDirectories.isEmpty();\r

     }\r
 \r
     private class DirectoryCreator implements Runnable {\r
     }\r
 \r
     private class DirectoryCreator implements Runnable {\r


@@ -402,15 +572,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
         @Override\r
         public void run() {\r
     \r
         @Override\r
         public void run() {\r

-            WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(\r
-                    mAccount, AccountAuthenticator.KEY_OC_URL)));\r
-    \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
             String username = mAccount.name.substring(0,\r
                     mAccount.name.lastIndexOf('@'));\r
             String password = mAm.getPassword(mAccount);\r
     \r
             wdc.setCredentials(username, password);\r

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

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


@@ -453,17 +622,164 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     FileSyncService.IN_PROGRESS, false);\r
             String account_name = intent\r
                     .getStringExtra(FileSyncService.ACCOUNT_NAME);\r
                     FileSyncService.IN_PROGRESS, false);\r
             String account_name = intent\r
                     .getStringExtra(FileSyncService.ACCOUNT_NAME);\r

+\r

             Log.d("FileDisplay", "sync of account " + account_name\r
                     + " is in_progress: " + inProgress);\r
             Log.d("FileDisplay", "sync of account " + account_name\r
                     + " is in_progress: " + inProgress);\r

-            setProgressBarIndeterminateVisibility(inProgress);\r
-            if (!inProgress) {\r
-                FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
-                        .findFragmentById(R.id.fileList);\r
-                if (fileListFramgent != null)\r
-                    fileListFramgent.listDirectory();\r
+\r
+            if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  \r
+            \r
+                String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); \r
+                 \r
+                boolean fillBlankRoot = false;\r
+                if (mCurrentDir == null) {\r
+                    mCurrentDir = mStorageManager.getFileByPath("/");\r
+                    fillBlankRoot = (mCurrentDir != null);\r
+                }\r
+\r
+                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {\r
+                    FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
+                            .findFragmentById(R.id.fileList);\r
+                    mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r
+                    if (fileListFragment != null) {\r
+                        fileListFragment.listDirectory(mCurrentDir);  \r
+                    }\r
+                }\r
+                \r
+                setSupportProgressBarIndeterminateVisibility(inProgress);\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.provider.Settings.ACTION_ADD_ACCOUNT);\r
+            intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            startActivity(intent); \r
+            mForcedLoginToCreateFirstAccount = true;\r
+        }\r
+    }\r
+\r
+    \r
+    \r
+    \r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public DataStorageManager getStorageManager() {\r
+        return mStorageManager;\r
+    }\r
+    \r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public void onDirectoryClick(OCFile directory) {\r
+        pushDirname(directory);\r
+        ActionBar actionBar = getSupportActionBar();\r
+        actionBar.setDisplayHomeAsUpEnabled(true);\r
+        \r
+        if (mDualPane) {\r
+            // Resets the FileDetailsFragment on Tablets so that it always displays\r
+            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fileDetails != null) {\r
+                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+                transaction.remove(fileDetails);\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+                transaction.commit();\r

             }\r
         }\r
             }\r
         }\r

+    }\r
+    \r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public void onFileClick(OCFile file) {\r
+        \r
+        // If we are on a large device -> update fragment\r
+        if (mDualPane) {\r
+            // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r
+            transaction.commit();\r
+            \r
+        } else {    // small or medium screen device -> new Activity\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r
+    \r
+    /**\r
+     *  Operations in this method should be preferably performed in onCreate to have a lighter onResume method. \r
+     * \r
+     *  But we need to delay them to onResume for the first start of the application, when no account exists and the login activity must be shown; and \r
+     *  put instead the ugly view that shows the 'Setup' button to restart the login activity.   \r
+     *  \r
+     *  In other way, if the users cancels or presses BACK in the login page that first time (users can be cruel sometimes) would show a blank view (the \r
+     *  FragmentList view empty).\r
+     *  \r
+     *  This is temporal, until we found out how to get a result in this activity after launching the ADD_ACCOUNT Intent with startActivityForResult (not trivial)\r
+     */\r
+    private void initDelayedTilAccountAvailabe() {\r
+        setContentView(mLayoutView);    \r
+        mDualPane = (findViewById(R.id.file_details_container) != null);\r
+        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
+            transaction.commit();\r
+        }\r
+        setSupportProgressBarIndeterminateVisibility(false);\r
+    }\r
+    \r

 \r
 \r

+    /**\r
+     * Launch an intent to request the PIN code to the user before letting him use the app\r
+     */\r
+    private void requestPinCode() {\r
+        boolean pinStart = false;\r
+        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
+        pinStart = appPrefs.getBoolean("set_pincode", false);\r
+        if (pinStart) {\r
+            Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
+            i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");\r
+            startActivity(i);\r
+        }\r

     }\r
 \r
     }\r
 \r

+    \r

 }\r
 }\r