From: masensio <masensio@solidgear.es>
Date: Fri, 16 May 2014 13:06:12 +0000 (+0200)
Subject: Merge pull request #493 from owncloud/fixed_not_performed_renamed_when_device_is_rota... 
X-Git-Tag: oc-android-1.7.0_signed~309^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/84178100798876fba915f7ed37ad62d686e92f01?hp=-c

Merge pull request #493 from owncloud/fixed_not_performed_renamed_when_device_is_rotated_while_showing_dialog

Fixed not performed rename when device is rotated while showing dialog
---

84178100798876fba915f7ed37ad62d686e92f01
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index fb1ecfa9,8a71d5f7..6cfa56c5
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -79,9 -79,8 +79,8 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.SynchronizeFolderOperation;
  import com.owncloud.android.operations.UnshareLinkOperation;
  import com.owncloud.android.syncadapter.FileSyncAdapter;
- import com.owncloud.android.ui.dialog.EditNameDialog;
+ import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
- import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
  import com.owncloud.android.ui.fragment.FileDetailFragment;
  import com.owncloud.android.ui.fragment.FileFragment;
@@@ -102,8 -101,7 +101,7 @@@ import com.owncloud.android.utils.Log_O
   */
  
  public class FileDisplayActivity extends HookActivity implements
- FileFragment.ContainerActivity, OnNavigationListener, 
- OnSslUntrustedCertListener, EditNameDialogListener {
+ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener {
  
      private ArrayAdapter<String> mDirectories;
  
@@@ -453,7 -451,8 +451,8 @@@
          boolean retval = true;
          switch (item.getItemId()) {
          case R.id.action_create_dir: {
-             EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this);
+             CreateFolderDialogFragment dialog = 
+                     CreateFolderDialogFragment.newInstance(getCurrentDir());
              dialog.show(getSupportFragmentManager(), "createdirdialog");
              break;
          }
@@@ -709,9 -708,6 +708,9 @@@
              unregisterReceiver(mDownloadFinishReceiver);
              mDownloadFinishReceiver = null;
          }
 +        
 +        dismissLoadingDialog();
 +        
          Log_OC.d(TAG, "onPause() end");
      }
  
@@@ -1441,21 -1437,6 +1440,6 @@@
          }
      }
  
- 
-     public void onDismiss(EditNameDialog dialog) {
-         if (dialog.getResult()) {
-             String newDirectoryName = dialog.getNewFilename().trim();
-             Log_OC.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);
-             if (newDirectoryName.length() > 0) {
-                 String path = getCurrentDir().getRemotePath();
- 
-                 // Create directory
-                 path += newDirectoryName + OCFile.PATH_SEPARATOR;
-                 getFileOperationsHelper().createFolder(path, false);
-             }
-         }
-     }
- 
  
      private void requestForDownload() {
          Account account = getAccount();