Merge branch 'bug_hunting' into feature_previews

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java

diff --cc AndroidManifest.xml
Simple merge

diff --cc res/values-de-rDE/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values/strings.xml
index 9abfa79,3803e22..f54a5d5
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -1,8 -1,6 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <resources>
 +
      <string name="app_name">ownCloud</string>
-     <string name="whats_new">What\'s new</string>
      <string name="main_password">Password:</string>
      <string name="main_login">Username:</string>
      <string name="main_button_login">Login</string>
@@@ -23,10 -23,8 +22,9 @@@
      <string name="actionbar_mkdir">Create directory</string>
      <string name="actionbar_search">Search</string>
      <string name="actionbar_settings">Settings</string>
 +    <string name="actionbar_see_details">Details</string>
      
      <string name="prefs_category_general">General</string>
-     <string name="prefs_category_trackmydevice">Device tracking</string>
      <string name="prefs_add_session">Add new session</string>
      <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
      <string name="prefs_select_oc_account">Select an account</string>

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ca0ff01,7df1ecb..17504a8
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -86,14 -85,12 +86,16 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
  import com.owncloud.android.syncadapter.FileSyncService;\r
  import com.owncloud.android.ui.dialog.ChangelogDialog;\r
+ import com.owncloud.android.ui.dialog.EditNameDialog;\r
  import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
+ import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r
  import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
  import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 +import com.owncloud.android.ui.fragment.FileFragment;\r
  import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 +import com.owncloud.android.ui.preview.PreviewImageActivity;\r
 +import com.owncloud.android.ui.preview.PreviewImageFragment;\r
 +import com.owncloud.android.ui.preview.PreviewMediaFragment;\r
  \r
  import com.owncloud.android.R;\r
  import eu.alefzero.webdav.WebdavClient;\r
@@@ -380,11 -346,12 +382,12 @@@ public class FileDisplayActivity extend
      public boolean onOptionsItemSelected(MenuItem item) {\r
          boolean retval = true;\r
          switch (item.getItemId()) {\r
 -            case R.id.createDirectoryItem: {\r
 -                //showDialog(DIALOG_CREATE_DIR);\r
 +            case R.id.action_create_dir: {\r
-                 showDialog(DIALOG_CREATE_DIR);\r
+                 EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", this);\r
+                 dialog.show(getSupportFragmentManager(), "createdirdialog");\r
 +                break;\r
              }\r
 -            case R.id.startSync: {\r
 +            case R.id.action_sync_account: {\r
                  startSynchronization();\r
                  break;\r
              }\r
@@@ -1437,32 -1286,31 +1440,58 @@@
  \r
  \r
      @Override\r
 +    public void showFragmentWithDetails(OCFile file) {\r
 +        if (mDualPane) {\r
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); \r
 +            transaction.commit();\r
 +            \r
 +        } else {\r
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);\r
 +            startActivity(showDetailsIntent);\r
 +        }\r
 +    }\r
 +\r
+     public void onDismiss(EditNameDialog dialog) {\r
+         //dialog.dismiss();\r
+         if (dialog.getResult()) {\r
+             String newDirectoryName = dialog.getNewFilename().trim();\r
+             Log.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);\r
+             if (newDirectoryName.length() > 0) {\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(OCFile.PATH_SEPARATOR)) {\r
+                         OCFile file = new OCFile(OCFile.PATH_SEPARATOR);\r
+                         mStorageManager.saveFile(file);\r
+                     }\r
+                     mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);\r
+                 }\r
+                 path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
+                 \r
+                 // Create directory\r
+                 path += newDirectoryName + OCFile.PATH_SEPARATOR;\r
+                 Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));\r
+                 thread.start();\r
+                 \r
+                 showDialog(DIALOG_SHORT_WAIT);\r
+             }\r
+         }\r
+     }\r
  \r
 +    private void requestForDownload() {\r
 +        Account account = AccountUtils.getCurrentOwnCloudAccount(this);\r
 +        if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {\r
 +            Intent i = new Intent(this, FileDownloader.class);\r
 +            i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);\r
 +            i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview);\r
 +            startService(i);\r
 +        }\r
 +    }\r
 +\r
 +    \r
  }\r
 +