From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 4 Apr 2013 14:49:04 +0000 (+0200)
Subject: Merge branch 'bug_hunting' into feature_previews
X-Git-Tag: oc-android-1.4.3~39^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/053aad5ae17a1ad7a15218c220810e6b369fea4c?ds=sidebyside;hp=--cc

Merge branch 'bug_hunting' into feature_previews

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

053aad5ae17a1ad7a15218c220810e6b369fea4c
diff --cc res/values/strings.xml
index 9abfa798,3803e22d..f54a5d56
--- a/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 ca0ff010,7df1ecbb..17504a8f
--- a/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;
  import com.owncloud.android.syncadapter.FileSyncService;
  import com.owncloud.android.ui.dialog.ChangelogDialog;
+ import com.owncloud.android.ui.dialog.EditNameDialog;
  import com.owncloud.android.ui.dialog.SslValidatorDialog;
+ import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
  import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
  import com.owncloud.android.ui.fragment.FileDetailFragment;
 +import com.owncloud.android.ui.fragment.FileFragment;
  import com.owncloud.android.ui.fragment.OCFileListFragment;
 +import com.owncloud.android.ui.preview.PreviewImageActivity;
 +import com.owncloud.android.ui.preview.PreviewImageFragment;
 +import com.owncloud.android.ui.preview.PreviewMediaFragment;
  
  import com.owncloud.android.R;
  import eu.alefzero.webdav.WebdavClient;
@@@ -380,11 -346,12 +382,12 @@@ public class FileDisplayActivity extend
      public boolean onOptionsItemSelected(MenuItem item) {
          boolean retval = true;
          switch (item.getItemId()) {
 -            case R.id.createDirectoryItem: {
 -                //showDialog(DIALOG_CREATE_DIR);
 +            case R.id.action_create_dir: {
-                 showDialog(DIALOG_CREATE_DIR);
+                 EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", this);
+                 dialog.show(getSupportFragmentManager(), "createdirdialog");
 +                break;
              }
 -            case R.id.startSync: {
 +            case R.id.action_sync_account: {
                  startSynchronization();
                  break;
              }
@@@ -1437,32 -1286,31 +1440,58 @@@
  
  
      @Override
 +    public void showFragmentWithDetails(OCFile file) {
 +        if (mDualPane) {
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); 
 +            transaction.commit();
 +            
 +        } else {
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 +            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);
 +            startActivity(showDetailsIntent);
 +        }
 +    }
 +
+     public void onDismiss(EditNameDialog dialog) {
+         //dialog.dismiss();
+         if (dialog.getResult()) {
+             String newDirectoryName = dialog.getNewFilename().trim();
+             Log.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);
+             if (newDirectoryName.length() > 0) {
+                 String path;
+                 if (mCurrentDir == null) {
+                     // this is just a patch; we should ensure that mCurrentDir never is null
+                     if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {
+                         OCFile file = new OCFile(OCFile.PATH_SEPARATOR);
+                         mStorageManager.saveFile(file);
+                     }
+                     mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
+                 }
+                 path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
+                 
+                 // Create directory
+                 path += newDirectoryName + OCFile.PATH_SEPARATOR;
+                 Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));
+                 thread.start();
+                 
+                 showDialog(DIALOG_SHORT_WAIT);
+             }
+         }
+     }
  
 +    private void requestForDownload() {
 +        Account account = AccountUtils.getCurrentOwnCloudAccount(this);
 +        if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
 +            Intent i = new Intent(this, FileDownloader.class);
 +            i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
 +            i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview);
 +            startService(i);
 +        }
 +    }
 +
 +    
  }
 +