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

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

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1576a60..85711d7 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -99,6 +99,7 @@ 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.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;

+import com.owncloud.android.ui.preview.PreviewTextFragment;

 import com.owncloud.android.ui.preview.PreviewVideoActivity;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.ui.preview.PreviewVideoActivity;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;


@@ -107,7 +108,6 @@ import com.owncloud.android.utils.UriUtils;
 
 import java.io.File;
 
 
 import java.io.File;
 

-

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


@@ -116,6 +116,8 @@ public class FileDisplayActivity extends HookActivity
         implements FileFragment.ContainerActivity,
         OnSslUntrustedCertListener, OnEnforceableRefreshListener {
 
         implements FileFragment.ContainerActivity,
         OnSslUntrustedCertListener, OnEnforceableRefreshListener {
 

+
+

     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
     private DownloadFinishReceiver mDownloadFinishReceiver;
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
     private DownloadFinishReceiver mDownloadFinishReceiver;


@@ -174,7 +176,6 @@ public class FileDisplayActivity extends HookActivity
             mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
             mWaitingToSend = (OCFile) savedInstanceState.getParcelable(
                     FileDisplayActivity.KEY_WAITING_TO_SEND);
             mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
             mWaitingToSend = (OCFile) savedInstanceState.getParcelable(
                     FileDisplayActivity.KEY_WAITING_TO_SEND);

-           

         } else {
             mWaitingToPreview = null;
             mSyncInProgress = false;
         } else {
             mWaitingToPreview = null;
             mSyncInProgress = false;


@@ -212,7 +213,7 @@ public class FileDisplayActivity extends HookActivity
 
         mProgressBar.setIndeterminate(mSyncInProgress);
         // always AFTER setContentView(...) ; to work around bug in its implementation
 
         mProgressBar.setIndeterminate(mSyncInProgress);
         // always AFTER setContentView(...) ; to work around bug in its implementation

-        
+

         setBackgroundText();
 
         Log_OC.v(TAG, "onCreate() end");
         setBackgroundText();
 
         Log_OC.v(TAG, "onCreate() end");


@@ -296,6 +297,7 @@ public class FileDisplayActivity extends HookActivity
                 listOfFiles.listDirectory(getCurrentDir());
                 // TODO Enable when "On Device" is recovered
                 // listOfFiles.listDirectory(getCurrentDir(), MainApp.getOnlyOnDevice());
                 listOfFiles.listDirectory(getCurrentDir());
                 // TODO Enable when "On Device" is recovered
                 // listOfFiles.listDirectory(getCurrentDir(), MainApp.getOnlyOnDevice());

+

             } 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 >(");
             }


@@ -307,9 +309,11 @@ public class FileDisplayActivity extends HookActivity
                 setSecondFragment(secondFragment);
                 updateFragmentsVisibility(true);
                 updateActionBarTitleAndHomeButton(file);
                 setSecondFragment(secondFragment);
                 updateFragmentsVisibility(true);
                 updateActionBarTitleAndHomeButton(file);

-                
+

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

+                if (file.isDown() && PreviewTextFragment.canBePreviewed(file))
+                    startTextPreview(file);

             }
 
         } else {
             }
 
         } else {


@@ -336,9 +340,11 @@ public class FileDisplayActivity extends HookActivity
                 secondFragment = new PreviewMediaFragment(file, getAccount(),
                         startPlaybackPosition, autoplay);
 
                 secondFragment = new PreviewMediaFragment(file, getAccount(),
                         startPlaybackPosition, autoplay);
 

+            } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) {
+                secondFragment = null;

             } else {
             } else {

-                secondFragment = FileDetailFragment.newInstance(file, getAccount());
-            }
+            secondFragment = FileDetailFragment.newInstance(file, getAccount());
+        }

         }
         return secondFragment;
     }
         }
         return secondFragment;
     }


@@ -455,6 +461,9 @@ public class FileDisplayActivity extends HookActivity
                         if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
                             startMediaPreview(mWaitingToPreview, 0, true);
                             detailsFragmentChanged = true;
                         if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
                             startMediaPreview(mWaitingToPreview, 0, true);
                             detailsFragmentChanged = true;

+                        } else if (PreviewTextFragment.canBePreviewed(mWaitingToPreview)) {
+                            startTextPreview(mWaitingToPreview);
+                            detailsFragmentChanged = true;

                         } else {
                             getFileOperationsHelper().openFile(mWaitingToPreview);
                         }
                         } else {
                             getFileOperationsHelper().openFile(mWaitingToPreview);
                         }


@@ -495,6 +504,7 @@ public class FileDisplayActivity extends HookActivity
                 createFolder();
                 break;
             }
                 createFolder();
                 break;
             }

+

             case R.id.action_sync_account: {
                 startSynchronization();
                 break;
             case R.id.action_sync_account: {
                 startSynchronization();
                 break;


@@ -503,7 +513,6 @@ public class FileDisplayActivity extends HookActivity
                 UploadSourceDialogFragment dialog =
                         UploadSourceDialogFragment.newInstance(getAccount());
                 dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE);
                 UploadSourceDialogFragment dialog =
                         UploadSourceDialogFragment.newInstance(getAccount());
                 dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE);

-

                 break;
             }
             case android.R.id.home: {
                 break;
             }
             case android.R.id.home: {


@@ -835,11 +844,9 @@ public class FileDisplayActivity extends HookActivity
     protected void onResume() {
         Log_OC.v(TAG, "onResume() start");
         super.onResume();
     protected void onResume() {
         Log_OC.v(TAG, "onResume() start");
         super.onResume();

-

         // refresh Navigation Drawer account list
         mNavigationDrawerAdapter.updateAccountList();
 
         // refresh Navigation Drawer account list
         mNavigationDrawerAdapter.updateAccountList();
 

-

         // refresh list of files
         refreshListOfFilesFragment();
 
         // refresh list of files
         refreshListOfFilesFragment();
 


@@ -867,6 +874,7 @@ public class FileDisplayActivity extends HookActivity
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
 
         Log_OC.v(TAG, "onResume() end");
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
 
         Log_OC.v(TAG, "onResume() end");

+

     }
 
 
     }
 
 


@@ -910,7 +918,7 @@ public class FileDisplayActivity extends HookActivity
                                 FileSyncAdapter.EXTRA_RESULT);
                 boolean sameAccount = (getAccount() != null &&
                         accountName.equals(getAccount().name) && getStorageManager() != null);
                                 FileSyncAdapter.EXTRA_RESULT);
                 boolean sameAccount = (getAccount() != null &&
                         accountName.equals(getAccount().name) && getStorageManager() != null);

-    
+

                 if (sameAccount) {
 
                     if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {
                 if (sameAccount) {
 
                     if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {


@@ -931,6 +939,7 @@ public class FileDisplayActivity extends HookActivity
                                                    synchFolderRemotePath),
                                             Toast.LENGTH_LONG)
                                 .show();
                                                    synchFolderRemotePath),
                                             Toast.LENGTH_LONG)
                                 .show();

+

                             browseToRoot();
 
                         } else {
                             browseToRoot();
 
                         } else {


@@ -959,8 +968,8 @@ public class FileDisplayActivity extends HookActivity
                                         .equals(event));
                                 
                         if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
                                         .equals(event));
                                 
                         if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.

-                                    equals(event) &&
-                                /// TODO refactor and make common
+                                    equals(event) &&/// TODO refactor and make common
+

                                 synchResult != null && !synchResult.isSuccess() &&
                                 (synchResult.getCode() == ResultCode.UNAUTHORIZED ||
                                         synchResult.isIdPRedirection() ||
                                 synchResult != null && !synchResult.isSuccess() &&
                                 (synchResult.getCode() == ResultCode.UNAUTHORIZED ||
                                         synchResult.isIdPRedirection() ||


@@ -974,7 +983,6 @@ public class FileDisplayActivity extends HookActivity
                                         new OwnCloudAccount(getAccount(), context);
                                 client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                                         removeClientFor(ocAccount));
                                         new OwnCloudAccount(getAccount(), context);
                                 client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                                         removeClientFor(ocAccount));

-

                                 if (client != null) {
                                     OwnCloudCredentials cred = client.getCredentials();
                                     if (cred != null) {
                                 if (client != null) {
                                     OwnCloudCredentials cred = client.getCredentials();
                                     if (cred != null) {


@@ -1094,10 +1102,15 @@ public class FileDisplayActivity extends HookActivity
                         cleanSecondFragment();
                     }
 
                         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 or text file
+                    if (uploadWasFine) {
+                        OCFile ocFile = getFile();
+                        if (PreviewImageFragment.canBePreviewed(ocFile))
+                            startImagePreview(getFile());
+                        else if (PreviewTextFragment.canBePreviewed(ocFile))
+                            startTextPreview(ocFile);
+                        // TODO what about other kind of previews?
+                    }

                 }
 
                 mProgressBar.setIndeterminate(false);
                 }
 
                 mProgressBar.setIndeterminate(false);


@@ -1146,7 +1159,7 @@ public class FileDisplayActivity extends HookActivity
                 if (mWaitingToSend != null) {
                     mWaitingToSend =
                             getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
                 if (mWaitingToSend != null) {
                     mWaitingToSend =
                             getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());

-                    if (mWaitingToSend.isDown()) { 
+                    if (mWaitingToSend.isDown()) {

                         sendDownloadedFile();
                     }
                 }
                         sendDownloadedFile();
                     }
                 }


@@ -1194,7 +1207,6 @@ public class FileDisplayActivity extends HookActivity
             startSyncFolderOperation(root, false);
         }
         cleanSecondFragment();
             startSyncFolderOperation(root, false);
         }
         cleanSecondFragment();

-

     }
 
 
     }
 
 


@@ -1273,7 +1285,7 @@ public class FileDisplayActivity extends HookActivity
             }
             // a new chance to get the mDownloadBinder through
             // getFileDownloadBinder() - THIS IS A MESS
             }
             // a new chance to get the mDownloadBinder through
             // getFileDownloadBinder() - THIS IS A MESS

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

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


@@ -1357,8 +1369,6 @@ public class FileDisplayActivity extends HookActivity
         }
 
     }
         }
 
     }

-
-

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


@@ -1367,7 +1377,6 @@ public class FileDisplayActivity extends HookActivity
         }
     }
 
         }
     }
 

-

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


@@ -1389,6 +1398,9 @@ public class FileDisplayActivity extends HookActivity
                 if (details instanceof PreviewMediaFragment) {
                     // Refresh  OCFile of the fragment
                     ((PreviewMediaFragment) details).updateFile(file);
                 if (details instanceof PreviewMediaFragment) {
                     // Refresh  OCFile of the fragment
                     ((PreviewMediaFragment) details).updateFile(file);

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

                 } else {
                     showDetails(file);
                 }
                 } else {
                     showDetails(file);
                 }


@@ -1410,7 +1422,7 @@ public class FileDisplayActivity extends HookActivity
 
         Toast msg = Toast.makeText(this,
                 ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
 
         Toast msg = Toast.makeText(this,
                 ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),

-                Toast.LENGTH_LONG); 
+                Toast.LENGTH_LONG);

         msg.show();
 
         if (result.isSuccess()) {
         msg.show();
 
         if (result.isSuccess()) {


@@ -1423,7 +1435,7 @@ public class FileDisplayActivity extends HookActivity
                 setFile(getStorageManager().getFileById(removedFile.getParentId()));
                 cleanSecondFragment();
             }
                 setFile(getStorageManager().getFileById(removedFile.getParentId()));
                 cleanSecondFragment();
             }

-            if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
+            if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())){

                 refreshListOfFilesFragment();
             }
             invalidateOptionsMenu();
                 refreshListOfFilesFragment();
             }
             invalidateOptionsMenu();


@@ -1515,6 +1527,14 @@ public class FileDisplayActivity extends HookActivity
                     } else {
                         getFileOperationsHelper().openFile(renamedFile);
                     }
                     } else {
                         getFileOperationsHelper().openFile(renamedFile);
                     }

+                } else if (details instanceof PreviewTextFragment &&
+                        renamedFile.equals(details.getFile())) {
+                    ((PreviewTextFragment) details).updateFile(renamedFile);
+                    if (PreviewTextFragment.canBePreviewed(renamedFile)) {
+                        startTextPreview(renamedFile);
+                    } else {
+                        getFileOperationsHelper().openFile(renamedFile);
+                    }

                 }
             }
 
                 }
             }
 


@@ -1525,7 +1545,7 @@ public class FileDisplayActivity extends HookActivity
         } else {
             Toast msg = Toast.makeText(this,
                     ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
         } else {
             Toast msg = Toast.makeText(this,
                     ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),

-                    Toast.LENGTH_LONG); 
+                    Toast.LENGTH_LONG);

             msg.show();
 
             if (result.isSslRecoverableException()) {
             msg.show();
 
             if (result.isSslRecoverableException()) {


@@ -1638,6 +1658,7 @@ public class FileDisplayActivity extends HookActivity
                 getApplicationContext()
         );
         synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
                 getApplicationContext()
         );
         synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);

+

         mProgressBar.setIndeterminate(true);
 
         setBackgroundText();
         mProgressBar.setIndeterminate(true);
 
         setBackgroundText();


@@ -1695,7 +1716,6 @@ public class FileDisplayActivity extends HookActivity
         showDetailsIntent.putExtra(EXTRA_FILE, file);
         showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
         startActivity(showDetailsIntent);
         showDetailsIntent.putExtra(EXTRA_FILE, file);
         showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
         startActivity(showDetailsIntent);

-

     }
 
     /**
     }
 
     /**


@@ -1717,6 +1737,23 @@ public class FileDisplayActivity extends HookActivity
     }
 
     /**
     }
 
     /**

+     * Stars the preview of a text file {@link OCFile}.
+     *
+     * @param file Text {@link OCFile} to preview.
+     */
+    public void startTextPreview(OCFile file) {
+        Bundle args = new Bundle();
+        args.putParcelable(EXTRA_FILE, file);
+        args.putParcelable(EXTRA_ACCOUNT, getAccount());
+        Fragment textPreviewFragment = Fragment.instantiate(getApplicationContext(),
+                PreviewTextFragment.class.getName(), args);
+        setSecondFragment(textPreviewFragment);
+        updateFragmentsVisibility(true);
+        //updateNavigationElementsInActionBar(file);
+        setFile(file);
+    }
+
+    /**

      * 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.