Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FolderPickerActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
index c3b96da..743b134 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
+++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
@@ -38,7 +38,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;

-import android.view.Window;

 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.Toast;


@@ -350,9 +349,9 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
         actionBar.setDisplayHomeAsUpEnabled(!atRoot);
         actionBar.setHomeButtonEnabled(!atRoot);
         actionBar.setTitle(
         actionBar.setDisplayHomeAsUpEnabled(!atRoot);
         actionBar.setHomeButtonEnabled(!atRoot);
         actionBar.setTitle(

-            atRoot 
-                ? getString(R.string.default_display_name_for_root_folder) 
-                : currentDir.getFileName()
+                atRoot
+                        ? getString(R.string.default_display_name_for_root_folder)
+                        : currentDir.getFileName()

         );
     }
 
         );
     }
 


@@ -390,7 +389,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
         super.onRemoteOperationFinish(operation, result);
         
         if (operation instanceof CreateFolderOperation) {
         super.onRemoteOperationFinish(operation, result);
         
         if (operation instanceof CreateFolderOperation) {

-            onCreateFolderOperationFinish((CreateFolderOperation)operation, result);
+            onCreateFolderOperationFinish((CreateFolderOperation) operation, result);

             
         }
     }
             
         }
     }


@@ -408,10 +407,8 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
             ) {
         
         if (result.isSuccess()) {
             ) {
         
         if (result.isSuccess()) {

-            dismissLoadingDialog();

             refreshListOfFilesFragment();
         } else {
             refreshListOfFilesFragment();
         } else {

-            dismissLoadingDialog();

             try {
                 Toast msg = Toast.makeText(FolderPickerActivity.this, 
                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 
             try {
                 Toast msg = Toast.makeText(FolderPickerActivity.this, 
                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 


@@ -542,9 +539,9 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
     
 
     /**
     
 
     /**

-     * Shows the information of the {@link OCFile} received as a 
+     * Shows the information of the {@link OCFile} received as a

      * parameter in the second fragment.
      * parameter in the second fragment.

-     * 
+     *

      * @param file          {@link OCFile} whose details will be shown
      */
     @Override
      * @param file          {@link OCFile} whose details will be shown
      */
     @Override