Added 'ACTION_COPY_FILES'.

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index a3d9b10..699107c 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -103,6 +103,9 @@ import com.owncloud.android.utils.UriUtils;
 
 import java.io.File;
 
 
 import java.io.File;
 

+import java.io.File;
+import java.io.IOException;
+

 
 /**
  * Displays, what files the user has available in his ownCloud.
 
 /**
  * Displays, what files the user has available in his ownCloud.


@@ -130,6 +133,7 @@ public class FileDisplayActivity extends HookActivity
     public static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     public static final int ACTION_SELECT_MULTIPLE_FILES = 2;
     public static final int ACTION_MOVE_FILES = 3;
     public static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     public static final int ACTION_SELECT_MULTIPLE_FILES = 2;
     public static final int ACTION_MOVE_FILES = 3;

+    public static final int ACTION_COPY_FILES = 4;

 
     private static final String TAG = FileDisplayActivity.class.getSimpleName();
 
 
     private static final String TAG = FileDisplayActivity.class.getSimpleName();
 


@@ -137,7 +141,7 @@ public class FileDisplayActivity extends HookActivity
     private static final String TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT";
 
     private OCFile mWaitingToPreview;
     private static final String TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT";
 
     private OCFile mWaitingToPreview;

-    
+

     private boolean mSyncInProgress = false;
 
     private static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
     private boolean mSyncInProgress = false;
 
     private static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";


@@ -161,7 +165,7 @@ public class FileDisplayActivity extends HookActivity
             Intent initObserversIntent = FileObserverService.makeInitIntent(this);
             startService(initObserversIntent);
         }
             Intent initObserversIntent = FileObserverService.makeInitIntent(this);
             startService(initObserversIntent);
         }

-        
+

         /// Load of saved instance state
         if(savedInstanceState != null) {
             mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(
         /// Load of saved instance state
         if(savedInstanceState != null) {
             mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(


@@ -174,13 +178,13 @@ public class FileDisplayActivity extends HookActivity
             mWaitingToPreview = null;
             mSyncInProgress = false;
             mWaitingToSend = null;
             mWaitingToPreview = null;
             mSyncInProgress = false;
             mWaitingToSend = null;

-        }        
+        }

 
         /// USER INTERFACE
 
         // Inflate and set the layout view
         setContentView(R.layout.files);
 
         /// USER INTERFACE
 
         // Inflate and set the layout view
         setContentView(R.layout.files);

-        
+

         // Navigation Drawer
         initDrawer();
 
         // Navigation Drawer
         initDrawer();
 


@@ -221,8 +225,8 @@ public class FileDisplayActivity extends HookActivity
     }
 
     /**
     }
 
     /**

-     *  Called when the ownCloud {@link Account} associated to the Activity was just updated.
-     */ 
+     * Called when the ownCloud {@link Account} associated to the Activity was just updated.
+     */

     @Override
     protected void onAccountSet(boolean stateWasRecovered) {
         super.onAccountSet(stateWasRecovered);
     @Override
     protected void onAccountSet(boolean stateWasRecovered) {
         super.onAccountSet(stateWasRecovered);


@@ -250,14 +254,14 @@ public class FileDisplayActivity extends HookActivity
                 file = getStorageManager().getFileByPath(OCFile.ROOT_PATH);  // never returns null
             }
             setFile(file);
                 file = getStorageManager().getFileByPath(OCFile.ROOT_PATH);  // never returns null
             }
             setFile(file);

-            
+

             if (!stateWasRecovered) {
                 Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();
                 if (file.isFolder()) {
                     startSyncFolderOperation(file, false);
                 }
             if (!stateWasRecovered) {
                 Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();
                 if (file.isFolder()) {
                     startSyncFolderOperation(file, false);
                 }

-                
+

             } else {
                 updateFragmentsVisibility(!file.isFolder());
                 updateActionBarTitleAndHomeButton(file.isFolder() ? null : file);
             } else {
                 updateFragmentsVisibility(!file.isFolder());
                 updateActionBarTitleAndHomeButton(file.isFolder() ? null : file);


@@ -272,11 +276,11 @@ public class FileDisplayActivity extends HookActivity
         transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
         transaction.commit();
     }
         transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
         transaction.commit();
     }

-    
+

     private void initFragmentsWithFile() {
         if (getAccount() != null && getFile() != null) {
             /// First fragment
     private void initFragmentsWithFile() {
         if (getAccount() != null && getFile() != null) {
             /// First fragment

-            OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+            OCFileListFragment listOfFiles = getListOfFilesFragment();

             if (listOfFiles != null) {
                 listOfFiles.listDirectory(getCurrentDir());
                 // TODO Enable when "On Device" is recovered
             if (listOfFiles != null) {
                 listOfFiles.listDirectory(getCurrentDir());
                 // TODO Enable when "On Device" is recovered


@@ -284,9 +288,9 @@ public class FileDisplayActivity extends HookActivity
             } else {
                 Log_OC.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
             }
             } else {
                 Log_OC.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
             }

-            
+

             /// Second fragment
             /// Second fragment

-            OCFile file = getFile(); 
+            OCFile file = getFile();

             Fragment secondFragment = chooseInitialSecondFragment(file);
             if (secondFragment != null) {
                 setSecondFragment(secondFragment);
             Fragment secondFragment = chooseInitialSecondFragment(file);
             if (secondFragment != null) {
                 setSecondFragment(secondFragment);


@@ -311,7 +315,7 @@ public class FileDisplayActivity extends HookActivity
     private Fragment chooseInitialSecondFragment(OCFile file) {
         Fragment secondFragment = null;
         if (file != null && !file.isFolder()) {
     private Fragment chooseInitialSecondFragment(OCFile file) {
         Fragment secondFragment = null;
         if (file != null && !file.isFolder()) {

-            if (file.isDown() && PreviewMediaFragment.canBePreviewed(file) 
+            if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)

                     && file.getLastSyncDateForProperties() > 0  // temporal fix
                     ) {
                 int startPlaybackPosition =
                     && file.getLastSyncDateForProperties() > 0  // temporal fix
                     ) {
                 int startPlaybackPosition =


@@ -332,10 +336,10 @@ public class FileDisplayActivity extends HookActivity
     /**
      * Replaces the second fragment managed by the activity with the received as
      * a parameter.
     /**
      * Replaces the second fragment managed by the activity with the received as
      * a parameter.

-     * 
-     * Assumes never will be more than two fragments managed at the same time. 
-     * 
-     * @param fragment      New second Fragment to set.
+     * <p/>
+     * Assumes never will be more than two fragments managed at the same time.
+     *
+     * @param fragment New second Fragment to set.

      */
     private void setSecondFragment(Fragment fragment) {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
      */
     private void setSecondFragment(Fragment fragment) {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();


@@ -376,7 +380,7 @@ public class FileDisplayActivity extends HookActivity
         Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(
                 FileDisplayActivity.TAG_LIST_OF_FILES);
         if (listOfFiles != null) {
         Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(
                 FileDisplayActivity.TAG_LIST_OF_FILES);
         if (listOfFiles != null) {

-            return (OCFileListFragment)listOfFiles;
+            return (OCFileListFragment) listOfFiles;

         }
         Log_OC.wtf(TAG, "Access to unexisting list of files fragment!!");
         return null;
         }
         Log_OC.wtf(TAG, "Access to unexisting list of files fragment!!");
         return null;


@@ -386,7 +390,7 @@ public class FileDisplayActivity extends HookActivity
         Fragment second = getSupportFragmentManager().findFragmentByTag(
                 FileDisplayActivity.TAG_SECOND_FRAGMENT);
         if (second != null) {
         Fragment second = getSupportFragmentManager().findFragmentByTag(
                 FileDisplayActivity.TAG_SECOND_FRAGMENT);
         if (second != null) {

-            return (FileFragment)second;
+            return (FileFragment) second;

         }
         return null;
     }
         }
         return null;
     }


@@ -597,18 +601,24 @@ public class FileDisplayActivity extends HookActivity
                 resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
             requestMultipleUpload(data, resultCode);
 
                 resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
             requestMultipleUpload(data, resultCode);
 

+//<<<<<<< HEAD

         } else if (requestCode == ACTION_MOVE_FILES && resultCode == RESULT_OK){
         } else if (requestCode == ACTION_MOVE_FILES && resultCode == RESULT_OK){

+/*=======
+        } else if (requestCode == ACTION_MOVE_FILES && (resultCode == RESULT_OK ||
+                resultCode == MoveActivity.RESULT_OK_AND_MOVE)) {
+>>>>>>> Added 'ACTION_COPY_FILES'.
+*/

 
             final Intent fData = data;
 
             final Intent fData = data;

-            final int fResultCode = resultCode; 
+            final int fResultCode = resultCode;

             getHandler().postDelayed(
             getHandler().postDelayed(

-                new Runnable() {
-                    @Override
-                    public void run() {
-                        requestMoveOperation(fData, fResultCode);
-                    }
-                }, 
-                DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
+                    new Runnable() {
+                        @Override
+                        public void run() {
+                            requestMoveOperation(fData, fResultCode);
+                        }
+                    },
+                    DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS

             );
 
         } else {
             );
 
         } else {


@@ -716,9 +726,9 @@ public class FileDisplayActivity extends HookActivity
 
     /**
      * Request the operation for moving the file/folder from one path to another
 
     /**
      * Request the operation for moving the file/folder from one path to another

-     * 
-     * @param data              Intent received
-     * @param resultCode        Result code received
+     *
+     * @param data       Intent received
+     * @param resultCode Result code received

      */
     private void requestMoveOperation(Intent data, int resultCode) {
         OCFile folderToMoveAt = (OCFile) data.getParcelableExtra(FolderPickerActivity.EXTRA_FOLDER);
      */
     private void requestMoveOperation(Intent data, int resultCode) {
         OCFile folderToMoveAt = (OCFile) data.getParcelableExtra(FolderPickerActivity.EXTRA_FOLDER);


@@ -728,7 +738,7 @@ public class FileDisplayActivity extends HookActivity
 
     @Override
     public void onBackPressed() {
 
     @Override
     public void onBackPressed() {

-        OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+        OCFileListFragment listOfFiles = getListOfFilesFragment();

         if (mDualPane || getSecondFragment() == null) {
             OCFile currentDir = getCurrentDir();
             if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {
         if (mDualPane || getSecondFragment() == null) {
             OCFile currentDir = getCurrentDir();
             if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {


@@ -760,7 +770,6 @@ public class FileDisplayActivity extends HookActivity
 
         Log_OC.v(TAG, "onSaveInstanceState() end");
     }
 
         Log_OC.v(TAG, "onSaveInstanceState() end");
     }

-    

 
 
     @Override
 
 
     @Override


@@ -797,7 +806,7 @@ public class FileDisplayActivity extends HookActivity
         downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());
         mDownloadFinishReceiver = new DownloadFinishReceiver();
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
         downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());
         mDownloadFinishReceiver = new DownloadFinishReceiver();
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);

-        
+

         Log_OC.v(TAG, "onResume() end");
     }
 
         Log_OC.v(TAG, "onResume() end");
     }
 


@@ -818,7 +827,7 @@ public class FileDisplayActivity extends HookActivity
             unregisterReceiver(mDownloadFinishReceiver);
             mDownloadFinishReceiver = null;
         }
             unregisterReceiver(mDownloadFinishReceiver);
             mDownloadFinishReceiver = null;
         }

-        
+

         super.onPause();
         Log_OC.v(TAG, "onPause() end");
     }
         super.onPause();
         Log_OC.v(TAG, "onPause() end");
     }


@@ -844,10 +853,10 @@ public class FileDisplayActivity extends HookActivity
                         accountName.equals(getAccount().name) && getStorageManager() != null);
     
                 if (sameAccount) {
                         accountName.equals(getAccount().name) && getStorageManager() != null);
     
                 if (sameAccount) {

-                    
+

                     if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {
                         mSyncInProgress = true;
                     if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {
                         mSyncInProgress = true;

-                        
+

                     } else {
                         OCFile currentFile = (getFile() == null) ? null :
                                 getStorageManager().getFileByPath(getFile().getRemotePath());
                     } else {
                         OCFile currentFile = (getFile() == null) ? null :
                                 getStorageManager().getFileByPath(getFile().getRemotePath());


@@ -864,7 +873,7 @@ public class FileDisplayActivity extends HookActivity
                                             Toast.LENGTH_LONG)
                                 .show();
                             browseToRoot();
                                             Toast.LENGTH_LONG)
                                 .show();
                             browseToRoot();

-                            
+

                         } else {
                             if (currentFile == null && !getFile().isFolder()) {
                                 // currently selected file was removed in the server, and now we
                         } else {
                             if (currentFile == null && !getFile().isFolder()) {
                                 // currently selected file was removed in the server, and now we


@@ -885,7 +894,7 @@ public class FileDisplayActivity extends HookActivity
                             }
                             setFile(currentFile);
                         }
                             }
                             setFile(currentFile);
                         }

-                        
+

                         mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
                                 !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED
                                         .equals(event));
                         mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
                                 !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED
                                         .equals(event));


@@ -893,11 +902,11 @@ public class FileDisplayActivity extends HookActivity
                         if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
                                     equals(event) &&
                                 /// TODO refactor and make common
                         if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
                                     equals(event) &&
                                 /// TODO refactor and make common

-                                synchResult != null && !synchResult.isSuccess() &&  
-                                (synchResult.getCode() == ResultCode.UNAUTHORIZED   || 
-                                    synchResult.isIdPRedirection()                  ||
-                                    (synchResult.isException() && synchResult.getException() 
-                                            instanceof AuthenticatorException))) {
+                                synchResult != null && !synchResult.isSuccess() &&
+                                (synchResult.getCode() == ResultCode.UNAUTHORIZED ||
+                                        synchResult.isIdPRedirection() ||
+                                        (synchResult.isException() && synchResult.getException()
+                                                instanceof AuthenticatorException))) {

 
 
                             try {
 
 
                             try {


@@ -935,9 +944,9 @@ public class FileDisplayActivity extends HookActivity
                     /*|| mRefreshSharesInProgress*/);
 
                     setBackgroundText();
                     /*|| mRefreshSharesInProgress*/);
 
                     setBackgroundText();

-                        
+

                 }
                 }

-                
+

                 if (synchResult != null) {
                     if (synchResult.getCode().equals(
                             RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
                 if (synchResult != null) {
                     if (synchResult.getCode().equals(
                             RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {


@@ -951,7 +960,7 @@ public class FileDisplayActivity extends HookActivity
             }
         }
     }
             }
         }
     }

-    
+

     /**
      * Show a text message on screen view for notifying user if content is
      * loading or folder is empty
     /**
      * Show a text message on screen view for notifying user if content is
      * loading or folder is empty


@@ -976,7 +985,8 @@ public class FileDisplayActivity extends HookActivity
     private class UploadFinishReceiver extends BroadcastReceiver {
         /**
          * Once the file upload has finished -> update view
     private class UploadFinishReceiver extends BroadcastReceiver {
         /**
          * Once the file upload has finished -> update view

-         *  @author David A. Velasco
+         *
+         * @author David A. Velasco

          * {@link BroadcastReceiver} to enable upload feedback in UI
          */
         @Override
          * {@link BroadcastReceiver} to enable upload feedback in UI
          */
         @Override


@@ -986,23 +996,23 @@ public class FileDisplayActivity extends HookActivity
                 String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
                 boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
                 OCFile currentDir = getCurrentDir();
                 String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
                 boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
                 OCFile currentDir = getCurrentDir();

-                boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && 
+                boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) &&

                         (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
                         (uploadedRemotePath.startsWith(currentDir.getRemotePath()));

-                
+

                 if (sameAccount && isDescendant) {
                     refreshListOfFilesFragment();
                 }
                 if (sameAccount && isDescendant) {
                     refreshListOfFilesFragment();
                 }

-                
+

                 boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT,
                         false);
                 boolean renamedInUpload = getFile().getRemotePath().
                         equals(intent.getStringExtra(FileUploader.EXTRA_OLD_REMOTE_PATH));
                 boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT,
                         false);
                 boolean renamedInUpload = getFile().getRemotePath().
                         equals(intent.getStringExtra(FileUploader.EXTRA_OLD_REMOTE_PATH));

-                boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) || 
+                boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) ||

                         renamedInUpload;
                 FileFragment details = getSecondFragment();
                         renamedInUpload;
                 FileFragment details = getSecondFragment();

-                boolean detailFragmentIsShown = (details != null && 
+                boolean detailFragmentIsShown = (details != null &&

                         details instanceof FileDetailFragment);
                         details instanceof FileDetailFragment);

-                
+

                 if (sameAccount && sameFile && detailFragmentIsShown) {
                     if (uploadWasFine) {
                         setFile(getStorageManager().getFileByPath(uploadedRemotePath));
                 if (sameAccount && sameFile && detailFragmentIsShown) {
                     if (uploadWasFine) {
                         setFile(getStorageManager().getFileByPath(uploadedRemotePath));


@@ -1010,39 +1020,39 @@ public class FileDisplayActivity extends HookActivity
                     if (renamedInUpload) {
                         String newName = (new File(uploadedRemotePath)).getName();
                         Toast msg = Toast.makeText(
                     if (renamedInUpload) {
                         String newName = (new File(uploadedRemotePath)).getName();
                         Toast msg = Toast.makeText(

-                                context, 
+                                context,

                                 String.format(
                                 String.format(

-                                        getString(R.string.filedetails_renamed_in_upload_msg), 
-                                        newName), 
+                                        getString(R.string.filedetails_renamed_in_upload_msg),
+                                        newName),

                                 Toast.LENGTH_LONG);
                         msg.show();
                     }
                     if (uploadWasFine || getFile().fileExists()) {
                                 Toast.LENGTH_LONG);
                         msg.show();
                     }
                     if (uploadWasFine || getFile().fileExists()) {

-                        ((FileDetailFragment)details).updateFileDetails(false, true);
+                        ((FileDetailFragment) details).updateFileDetails(false, true);

                     } else {
                         cleanSecondFragment();
                     }
                     } else {
                         cleanSecondFragment();
                     }

-                    
+

                     // Force the preview if the file is an image
                     if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {
                         startImagePreview(getFile());
                     } // TODO what about other kind of previews?
                 }
                     // Force the preview if the file is an image
                     if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {
                         startImagePreview(getFile());
                     } // TODO what about other kind of previews?
                 }

-                
+

             } finally {
                 if (intent != null) {
                     removeStickyBroadcast(intent);
                 }
             }
             } finally {
                 if (intent != null) {
                     removeStickyBroadcast(intent);
                 }
             }

-            
+

         }
         }

-        
+

     }
 
 
     /**
      * Class waiting for broadcast events from the {@link FileDownloader} service.
     }
 
 
     /**
      * Class waiting for broadcast events from the {@link FileDownloader} service.

-     * 
+     *

      * Updates the UI when a download is started or finished, provided that it is relevant for the
      * current folder.
      */
      * Updates the UI when a download is started or finished, provided that it is relevant for the
      * current folder.
      */


@@ -1070,7 +1080,7 @@ public class FileDisplayActivity extends HookActivity
                             intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)
                     );
                 }
                             intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)
                     );
                 }

-    
+

                 if (mWaitingToSend != null) {
                     mWaitingToSend =
                             getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
                 if (mWaitingToSend != null) {
                     mWaitingToSend =
                             getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());


@@ -1078,7 +1088,7 @@ public class FileDisplayActivity extends HookActivity
                         sendDownloadedFile();
                     }
                 }
                         sendDownloadedFile();
                     }
                 }

-            
+

             } finally {
                 if (intent != null) {
                     removeStickyBroadcast(intent);
             } finally {
                 if (intent != null) {
                     removeStickyBroadcast(intent);


@@ -1109,10 +1119,10 @@ public class FileDisplayActivity extends HookActivity
                     accountName.equals(getAccount().name));
         }
     }
                     accountName.equals(getAccount().name));
         }
     }

-    
-    
+
+

     public void browseToRoot() {
     public void browseToRoot() {

-        OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+        OCFileListFragment listOfFiles = getListOfFilesFragment();

         if (listOfFiles != null) {  // should never be null, indeed
             OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
             listOfFiles.listDirectory(root);
         if (listOfFiles != null) {  // should never be null, indeed
             OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
             listOfFiles.listDirectory(root);


@@ -1128,7 +1138,7 @@ public class FileDisplayActivity extends HookActivity
 
     /**
      * {@inheritDoc}
 
     /**
      * {@inheritDoc}

-     * 
+     * <p/>

      * Updates action bar and second fragment, if in dual pane mode.
      */
     @Override
      * Updates action bar and second fragment, if in dual pane mode.
      */
     @Override


@@ -1140,10 +1150,10 @@ public class FileDisplayActivity extends HookActivity
     }
 
     /**
     }
 
     /**

-     * 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
+     *
+     * @param file {@link OCFile} whose details will be shown

      */
     @Override
     public void showDetails(OCFile file) {
      */
     @Override
     public void showDetails(OCFile file) {


@@ -1172,7 +1182,9 @@ public class FileDisplayActivity extends HookActivity
         return new ListServiceConnection();
     }
 
         return new ListServiceConnection();
     }
 

-    /** Defines callbacks for service binding, passed to bindService() */
+    /**
+     * Defines callbacks for service binding, passed to bindService()
+     */

     private class ListServiceConnection implements ServiceConnection {
 
         @Override
     private class ListServiceConnection implements ServiceConnection {
 
         @Override


@@ -1189,7 +1201,7 @@ public class FileDisplayActivity extends HookActivity
                         if (!mWaitingToPreview.isDown()) {
                             requestForDownload();
                         }
                         if (!mWaitingToPreview.isDown()) {
                             requestForDownload();
                         }

-                }
+                    }

 
             } else if (component.equals(new ComponentName(FileDisplayActivity.this,
                     FileUploader.class))) {
 
             } else if (component.equals(new ComponentName(FileDisplayActivity.this,
                     FileUploader.class))) {


@@ -1208,7 +1220,7 @@ public class FileDisplayActivity extends HookActivity
             }
             FileFragment secondFragment = getSecondFragment();
             if (secondFragment != null && secondFragment instanceof FileDetailFragment) {
             }
             FileFragment secondFragment = getSecondFragment();
             if (secondFragment != null && secondFragment instanceof FileDetailFragment) {

-                FileDetailFragment detailFragment = (FileDetailFragment)secondFragment;
+                FileDetailFragment detailFragment = (FileDetailFragment) secondFragment;

                 detailFragment.listenForTransferProgress();
                 detailFragment.updateFileDetails(false, false);
             }
                 detailFragment.listenForTransferProgress();
                 detailFragment.updateFileDetails(false, false);
             }


@@ -1226,7 +1238,7 @@ public class FileDisplayActivity extends HookActivity
                 mUploaderBinder = null;
             }
         }
                 mUploaderBinder = null;
             }
         }

-    };    
+    }

 
     @Override
     public void onSavedCertificate() {
 
     @Override
     public void onSavedCertificate() {


@@ -1250,39 +1262,39 @@ public class FileDisplayActivity extends HookActivity
     /**
      * Updates the view associated to the activity after the finish of some operation over files
      * in the current account.
     /**
      * Updates the view associated to the activity after the finish of some operation over files
      * in the current account.

-     * 
-     * @param operation     Removal operation performed.
-     * @param result        Result of the removal.
+     *
+     * @param operation Removal operation performed.
+     * @param result    Result of the removal.

      */
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
         super.onRemoteOperationFinish(operation, result);
      */
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
         super.onRemoteOperationFinish(operation, result);

-        
+

         if (operation instanceof RemoveFileOperation) {
             onRemoveFileOperationFinish((RemoveFileOperation) operation, result);
 
         } else if (operation instanceof RenameFileOperation) {
         if (operation instanceof RemoveFileOperation) {
             onRemoveFileOperationFinish((RemoveFileOperation) operation, result);
 
         } else if (operation instanceof RenameFileOperation) {

-            onRenameFileOperationFinish((RenameFileOperation)operation, result);
+            onRenameFileOperationFinish((RenameFileOperation) operation, result);

 
         } else if (operation instanceof SynchronizeFileOperation) {
 
         } else if (operation instanceof SynchronizeFileOperation) {

-            onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);
+            onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);

 
         } else if (operation instanceof CreateFolderOperation) {
 
         } else if (operation instanceof CreateFolderOperation) {

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

         } else if (operation instanceof CreateShareOperation) {
             onCreateShareOperationFinish((CreateShareOperation) operation, result);
         } else if (operation instanceof CreateShareOperation) {
             onCreateShareOperationFinish((CreateShareOperation) operation, result);

-            
+

         } else if (operation instanceof UnshareLinkOperation) {
         } else if (operation instanceof UnshareLinkOperation) {

-            onUnshareLinkOperationFinish((UnshareLinkOperation)operation, result);
-        
+            onUnshareLinkOperationFinish((UnshareLinkOperation) operation, result);
+

         } else if (operation instanceof MoveFileOperation) {
         } else if (operation instanceof MoveFileOperation) {

-            onMoveFileOperationFinish((MoveFileOperation)operation, result);
+            onMoveFileOperationFinish((MoveFileOperation) operation, result);

         }
         }

-        
+

     }
 
     }
 

-    
+

     private void onCreateShareOperationFinish(CreateShareOperation operation,
                                               RemoteOperationResult result) {
         if (result.isSuccess()) {
     private void onCreateShareOperationFinish(CreateShareOperation operation,
                                               RemoteOperationResult result) {
         if (result.isSuccess()) {


@@ -1291,36 +1303,36 @@ public class FileDisplayActivity extends HookActivity
         }
     }
 
         }
     }
 

-    
+

     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation,
                                               RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();
             refreshListOfFilesFragment();
     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation,
                                               RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();
             refreshListOfFilesFragment();

-            
+

         } else if (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
             cleanSecondFragment();
             refreshListOfFilesFragment();
         }
     }
         } else if (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
             cleanSecondFragment();
             refreshListOfFilesFragment();
         }
     }

-    
+

     private void refreshShowDetails() {
         FileFragment details = getSecondFragment();
         if (details != null) {
             OCFile file = details.getFile();
             if (file != null) {
     private void refreshShowDetails() {
         FileFragment details = getSecondFragment();
         if (details != null) {
             OCFile file = details.getFile();
             if (file != null) {

-                file = getStorageManager().getFileByPath(file.getRemotePath()); 
+                file = getStorageManager().getFileByPath(file.getRemotePath());

                 if (details instanceof PreviewMediaFragment) {
                     // Refresh  OCFile of the fragment
                     ((PreviewMediaFragment) details).updateFile(file);
                 } else {
                     showDetails(file);
                 if (details instanceof PreviewMediaFragment) {
                     // Refresh  OCFile of the fragment
                     ((PreviewMediaFragment) details).updateFile(file);
                 } else {
                     showDetails(file);

-                } 
+                }

             }
             invalidateOptionsMenu();
             }
             invalidateOptionsMenu();

-        } 
+        }

     }
     }

-    
+

     /**
      * Updates the view associated to the activity after the finish of an operation trying to
      * remove a file.
     /**
      * Updates the view associated to the activity after the finish of an operation trying to
      * remove a file.


@@ -1331,18 +1343,18 @@ public class FileDisplayActivity extends HookActivity
     private void onRemoveFileOperationFinish(RemoveFileOperation operation,
                                              RemoteOperationResult result) {
         dismissLoadingDialog();
     private void onRemoveFileOperationFinish(RemoveFileOperation operation,
                                              RemoteOperationResult result) {
         dismissLoadingDialog();

-        
+

         Toast msg = Toast.makeText(this,
                 ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                 Toast.LENGTH_LONG); 
         msg.show();
         Toast msg = Toast.makeText(this,
                 ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                 Toast.LENGTH_LONG); 
         msg.show();

-        
+

         if (result.isSuccess()) {
             OCFile removedFile = operation.getFile();
             FileFragment second = getSecondFragment();
             if (second != null && removedFile.equals(second.getFile())) {
                 if (second instanceof PreviewMediaFragment) {
         if (result.isSuccess()) {
             OCFile removedFile = operation.getFile();
             FileFragment second = getSecondFragment();
             if (second != null && removedFile.equals(second.getFile())) {
                 if (second instanceof PreviewMediaFragment) {

-                    ((PreviewMediaFragment)second).stopPreview(true);
+                    ((PreviewMediaFragment) second).stopPreview(true);

                 }
                 setFile(getStorageManager().getFileById(removedFile.getParentId()));
                 cleanSecondFragment();
                 }
                 setFile(getStorageManager().getFileById(removedFile.getParentId()));
                 cleanSecondFragment();


@@ -1358,14 +1370,14 @@ public class FileDisplayActivity extends HookActivity
             }
         }
     }
             }
         }
     }

-    
-    
+
+

     /**
     /**

-     * Updates the view associated to the activity after the finish of an operation trying to move a 
+     * Updates the view associated to the activity after the finish of an operation trying to move a

      * file.
      * file.

-     * 
-     * @param operation     Move operation performed.
-     * @param result        Result of the move operation.
+     *
+     * @param operation Move operation performed.
+     * @param result    Result of the move operation.

      */
     private void onMoveFileOperationFinish(MoveFileOperation operation,
                                            RemoteOperationResult result) {
      */
     private void onMoveFileOperationFinish(MoveFileOperation operation,
                                            RemoteOperationResult result) {


@@ -1375,13 +1387,13 @@ public class FileDisplayActivity extends HookActivity
         } else {
             dismissLoadingDialog();
             try {
         } else {
             dismissLoadingDialog();
             try {

-                Toast msg = Toast.makeText(FileDisplayActivity.this, 
-                        ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 
-                        Toast.LENGTH_LONG); 
+                Toast msg = Toast.makeText(FileDisplayActivity.this,
+                        ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                        Toast.LENGTH_LONG);

                 msg.show();
 
             } catch (NotFoundException e) {
                 msg.show();
 
             } catch (NotFoundException e) {

-                Log_OC.e(TAG, "Error while trying to show fail message " , e);
+                Log_OC.e(TAG, "Error while trying to show fail message ", e);

             }
         }
     }
             }
         }
     }


@@ -1410,14 +1422,14 @@ public class FileDisplayActivity extends HookActivity
                         renamedFile.equals(details.getFile())) {
                     ((PreviewMediaFragment) details).updateFile(renamedFile);
                     if (PreviewMediaFragment.canBePreviewed(renamedFile)) {
                         renamedFile.equals(details.getFile())) {
                     ((PreviewMediaFragment) details).updateFile(renamedFile);
                     if (PreviewMediaFragment.canBePreviewed(renamedFile)) {

-                        int position = ((PreviewMediaFragment)details).getPosition();
+                        int position = ((PreviewMediaFragment) details).getPosition();

                         startMediaPreview(renamedFile, position, true);
                     } else {
                         getFileOperationsHelper().openFile(renamedFile);
                     }
                 }
             }
                         startMediaPreview(renamedFile, position, true);
                     } else {
                         getFileOperationsHelper().openFile(renamedFile);
                     }
                 }
             }

-            
+

             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())){
                 refreshListOfFilesFragment();
             }
             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())){
                 refreshListOfFilesFragment();
             }


@@ -1427,7 +1439,7 @@ public class FileDisplayActivity extends HookActivity
                     ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                     Toast.LENGTH_LONG); 
             msg.show();
                     ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                     Toast.LENGTH_LONG); 
             msg.show();

-            
+

             if (result.isSslRecoverableException()) {
                 mLastSslUntrustedServerResult = result;
                 showUntrustedCertDialog(mLastSslUntrustedServerResult);
             if (result.isSslRecoverableException()) {
                 mLastSslUntrustedServerResult = result;
                 showUntrustedCertDialog(mLastSslUntrustedServerResult);


@@ -1461,18 +1473,18 @@ public class FileDisplayActivity extends HookActivity
         } else {
             dismissLoadingDialog();
             try {
         } else {
             dismissLoadingDialog();
             try {

-                Toast msg = Toast.makeText(FileDisplayActivity.this, 
-                        ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 
-                        Toast.LENGTH_LONG); 
+                Toast msg = Toast.makeText(FileDisplayActivity.this,
+                        ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                        Toast.LENGTH_LONG);

                 msg.show();
 
             } catch (NotFoundException e) {
                 msg.show();
 
             } catch (NotFoundException e) {

-                Log_OC.e(TAG, "Error while trying to show fail message " , e);
+                Log_OC.e(TAG, "Error while trying to show fail message ", e);

             }
         }
     }
 
             }
         }
     }
 

-    
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1483,16 +1495,16 @@ public class FileDisplayActivity extends HookActivity
         if (details != null && details instanceof FileDetailFragment &&
                 file.equals(details.getFile()) ) {
             if (downloading || uploading) {
         if (details != null && details instanceof FileDetailFragment &&
                 file.equals(details.getFile()) ) {
             if (downloading || uploading) {

-                ((FileDetailFragment)details).updateFileDetails(file, getAccount());
+                ((FileDetailFragment) details).updateFileDetails(file, getAccount());

             } else {
                 if (!file.fileExists()) {
                     cleanSecondFragment();
                 } else {
             } else {
                 if (!file.fileExists()) {
                     cleanSecondFragment();
                 } else {

-                    ((FileDetailFragment)details).updateFileDetails(false, true);
+                    ((FileDetailFragment) details).updateFileDetails(false, true);

                 }
             }
         }
                 }
             }
         }

-            
+

     }
 
 
     }
 
 


@@ -1521,12 +1533,12 @@ public class FileDisplayActivity extends HookActivity
         }
         return null;
     }
         }
         return null;
     }

-    
+

     public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {
     public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {

-        long currentSyncTime = System.currentTimeMillis(); 
-        
+        long currentSyncTime = System.currentTimeMillis();
+

         mSyncInProgress = true;
         mSyncInProgress = true;

-                
+

         // perform folder synchronization
         RemoteOperation synchFolderOp = new RefreshFolderOperation( folder,
                 currentSyncTime,
         // perform folder synchronization
         RemoteOperation synchFolderOp = new RefreshFolderOperation( folder,
                 currentSyncTime,


@@ -1545,7 +1557,7 @@ public class FileDisplayActivity extends HookActivity
     }
 
     /**
     }
 
     /**

-     * Show untrusted cert dialog 
+     * Show untrusted cert dialog

      */
     public void showUntrustedCertDialog(RemoteOperationResult result) {
         // Show a dialog with the certificate info
      */
     public void showUntrustedCertDialog(RemoteOperationResult result) {
         // Show a dialog with the certificate info


@@ -1555,7 +1567,7 @@ public class FileDisplayActivity extends HookActivity
         FragmentTransaction ft = fm.beginTransaction();
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);
     }
         FragmentTransaction ft = fm.beginTransaction();
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);
     }

-    
+

     private void requestForDownload(OCFile file) {
         Account account = getAccount();
         if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
     private void requestForDownload(OCFile file) {
         Account account = getAccount();
         if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {


@@ -1565,43 +1577,43 @@ public class FileDisplayActivity extends HookActivity
             startService(i);
         }
     }
             startService(i);
         }
     }

-    
-    private void sendDownloadedFile(){
+
+    private void sendDownloadedFile() {

         getFileOperationsHelper().sendDownloadedFile(mWaitingToSend);
         mWaitingToSend = null;
     }
 
         getFileOperationsHelper().sendDownloadedFile(mWaitingToSend);
         mWaitingToSend = null;
     }
 

-    
+

     /**
      * Requests the download of the received {@link OCFile} , updates the UI
      * to monitor the download progress and prepares the activity to send the file
      * when the download finishes.
     /**
      * Requests the download of the received {@link OCFile} , updates the UI
      * to monitor the download progress and prepares the activity to send the file
      * when the download finishes.

-     * 
-     * @param file          {@link OCFile} to download and preview.
+     *
+     * @param file {@link OCFile} to download and preview.

      */
     public void startDownloadForSending(OCFile file) {
         mWaitingToSend = file;
         requestForDownload(mWaitingToSend);
      */
     public void startDownloadForSending(OCFile file) {
         mWaitingToSend = file;
         requestForDownload(mWaitingToSend);

-        boolean hasSecondFragment = (getSecondFragment()!= null);
+        boolean hasSecondFragment = (getSecondFragment() != null);

         updateFragmentsVisibility(hasSecondFragment);
     }
         updateFragmentsVisibility(hasSecondFragment);
     }

-    
+

     /**
      * Opens the image gallery showing the image {@link OCFile} received as parameter.
     /**
      * Opens the image gallery showing the image {@link OCFile} received as parameter.

-     * 
-     * @param file                      Image {@link OCFile} to show.
+     *
+     * @param file Image {@link OCFile} to show.

      */
     public void startImagePreview(OCFile file) {
         Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
         showDetailsIntent.putExtra(EXTRA_FILE, file);
         showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
         startActivity(showDetailsIntent);
      */
     public void startImagePreview(OCFile file) {
         Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
         showDetailsIntent.putExtra(EXTRA_FILE, file);
         showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
         startActivity(showDetailsIntent);

-        
+

     }
 
     /**
      * Stars the preview of an already down media {@link OCFile}.
     }
 
     /**
      * Stars the preview of an already down media {@link OCFile}.

-     * 
+     *

      * @param file                      Media {@link OCFile} to preview.
      * @param startPlaybackPosition     Media position where the playback will be started,
      *                                  in milliseconds.
      * @param file                      Media {@link OCFile} to preview.
      * @param startPlaybackPosition     Media position where the playback will be started,
      *                                  in milliseconds.


@@ -1621,8 +1633,8 @@ public class FileDisplayActivity extends HookActivity
      * Requests the download of the received {@link OCFile} , updates the UI
      * to monitor the download progress and prepares the activity to preview
      * or open the file when the download finishes.
      * Requests the download of the received {@link OCFile} , updates the UI
      * to monitor the download progress and prepares the activity to preview
      * or open the file when the download finishes.

-     * 
-     * @param file          {@link OCFile} to download and preview.
+     *
+     * @param file {@link OCFile} to download and preview.

      */
     public void startDownloadForPreview(OCFile file) {
         Fragment detailFragment = FileDetailFragment.newInstance(file, getAccount());
      */
     public void startDownloadForPreview(OCFile file) {
         Fragment detailFragment = FileDetailFragment.newInstance(file, getAccount());


@@ -1637,7 +1649,7 @@ public class FileDisplayActivity extends HookActivity
 
     public void cancelTransference(OCFile file) {
         getFileOperationsHelper().cancelTransference(file);
 
     public void cancelTransference(OCFile file) {
         getFileOperationsHelper().cancelTransference(file);

-        if (mWaitingToPreview != null && 
+        if (mWaitingToPreview != null &&

                 mWaitingToPreview.getRemotePath().equals(file.getRemotePath())) {
             mWaitingToPreview = null;
         }
                 mWaitingToPreview.getRemotePath().equals(file.getRemotePath())) {
             mWaitingToPreview = null;
         }