Merge pull request #493 from owncloud/fixed_not_performed_renamed_when_device_is_rota...
authormasensio <masensio@solidgear.es>
Fri, 16 May 2014 13:06:12 +0000 (15:06 +0200)
committermasensio <masensio@solidgear.es>
Fri, 16 May 2014 13:06:12 +0000 (15:06 +0200)
Fixed not performed rename when device is rotated while showing dialog

1  2 
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;
  
          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;
          }
              unregisterReceiver(mDownloadFinishReceiver);
              mDownloadFinishReceiver = null;
          }
 +        
 +        dismissLoadingDialog();
 +        
          Log_OC.d(TAG, "onPause() end");
      }
  
          }
      }
  
-     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();