Merge branch 'develop' into refactor_update_filelist_from_database

[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 b46693e..6cfa56c 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -79,9 +79,8 @@ import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.SynchronizeFolderOperation;
 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.syncadapter.FileSyncAdapter;
 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.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;
 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 @@ import com.owncloud.android.utils.Log_OC;
  */
 
 public class FileDisplayActivity extends HookActivity implements
  */
 
 public class FileDisplayActivity extends HookActivity implements

-FileFragment.ContainerActivity, OnNavigationListener, 
-OnSslUntrustedCertListener, EditNameDialogListener {
+FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener {

 
     private ArrayAdapter<String> mDirectories;
 
 
     private ArrayAdapter<String> mDirectories;
 


@@ -378,7 +376,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         return null;
     }
 
         return null;
     }
 

-    protected FileFragment getSecondFragment() {
+    public FileFragment getSecondFragment() {

         Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT);
         if (second != null) {
             return (FileFragment)second;
         Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT);
         if (second != null) {
             return (FileFragment)second;


@@ -397,7 +395,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         updateNavigationElementsInActionBar(null);
     }
 
         updateNavigationElementsInActionBar(null);
     }
 

-    protected void refeshListOfFilesFragment() {
+    protected void refreshListOfFilesFragment() {

         OCFileListFragment fileListFragment = getListOfFilesFragment();
         if (fileListFragment != null) { 
             fileListFragment.listDirectory();
         OCFileListFragment fileListFragment = getListOfFilesFragment();
         if (fileListFragment != null) { 
             fileListFragment.listDirectory();


@@ -453,7 +451,8 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         boolean retval = true;
         switch (item.getItemId()) {
         case R.id.action_create_dir: {
         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;
         }
             dialog.show(getSupportFragmentManager(), "createdirdialog");
             break;
         }


@@ -709,6 +708,9 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             unregisterReceiver(mDownloadFinishReceiver);
             mDownloadFinishReceiver = null;
         }
             unregisterReceiver(mDownloadFinishReceiver);
             mDownloadFinishReceiver = null;
         }

+        
+        dismissLoadingDialog();
+        

         Log_OC.d(TAG, "onPause() end");
     }
 
         Log_OC.d(TAG, "onPause() end");
     }
 


@@ -957,7 +959,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
                     (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
             
             if (sameAccount && isDescendant) {
                     (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
             
             if (sameAccount && isDescendant) {

-                refeshListOfFilesFragment();
+                refreshListOfFilesFragment();

             }
             
             boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false);
             }
             
             boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false);


@@ -983,7 +985,11 @@ OnSslUntrustedCertListener, EditNameDialogListener {
                             Toast.LENGTH_LONG);
                     msg.show();
                 }
                             Toast.LENGTH_LONG);
                     msg.show();
                 }

-                ((FileDetailFragment)details).updateFileDetails(false, false);
+                if (uploadWasFine || getFile().fileExists()) {
+                    ((FileDetailFragment)details).updateFileDetails(false, true);
+                } else {
+                    cleanSecondFragment();
+                }

                 
                 // Force the preview if the file is an image
                 if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {
                 
                 // Force the preview if the file is an image
                 if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {


@@ -1012,7 +1018,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             boolean isDescendant = isDescendant(downloadedRemotePath);
 
             if (sameAccount && isDescendant) {
             boolean isDescendant = isDescendant(downloadedRemotePath);
 
             if (sameAccount && isDescendant) {

-                refeshListOfFilesFragment();
+                refreshListOfFilesFragment();

                 refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
             }
 
                 refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
             }
 


@@ -1140,8 +1146,12 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
                 Log_OC.d(TAG, "Download service connected");
                 mDownloaderBinder = (FileDownloaderBinder) service;
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
                 Log_OC.d(TAG, "Download service connected");
                 mDownloaderBinder = (FileDownloaderBinder) service;

-                if (mWaitingToPreview != null) {
-                    requestForDownload();
+                if (mWaitingToPreview != null)
+                    if (getStorageManager() != null) {
+                        mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId()); // update the file
+                        if (!mWaitingToPreview.isDown()) {
+                            requestForDownload();
+                        }

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


@@ -1245,9 +1255,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
     private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();
     private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();

-            /* TODO WIP COMMENT 
-            refeshListOfFilesFragment();
-            */
+            refreshListOfFilesFragment();

         }
     }
 
         }
     }
 


@@ -1255,14 +1263,11 @@ OnSslUntrustedCertListener, EditNameDialogListener {
     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();
     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();

-            /*
-            refeshListOfFilesFragment();
-            */
+            refreshListOfFilesFragment();
+            

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

-            /*
-            refeshListOfFilesFragment();
-            */
+            refreshListOfFilesFragment();

         }
     }
     
         }
     }
     


@@ -1298,14 +1303,16 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             OCFile removedFile = operation.getFile();
             FileFragment second = getSecondFragment();
             if (second != null && removedFile.equals(second.getFile())) {
             OCFile removedFile = operation.getFile();
             FileFragment second = getSecondFragment();
             if (second != null && removedFile.equals(second.getFile())) {

+                if (second instanceof PreviewMediaFragment) {
+                    ((PreviewMediaFragment)second).stopPreview(true);
+                }
+                setFile(getStorageManager().getFileById(removedFile.getParentId()));

                 cleanSecondFragment();
             }
             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
                 cleanSecondFragment();
             }
             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {

-                /*
-                refeshListOfFilesFragment();
-                */
+                refreshListOfFilesFragment();

             }
             }

-
+            invalidateOptionsMenu();

         } else {
             Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); 
             msg.show();
         } else {
             Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); 
             msg.show();


@@ -1326,10 +1333,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
     private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             dismissLoadingDialog();
     private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             dismissLoadingDialog();

-            /* TODO WIP COMMENT 
-            refeshListOfFilesFragment();
-            */
-
+            refreshListOfFilesFragment();

         } else {
             dismissLoadingDialog();
             if (result.getCode() == ResultCode.INVALID_CHARACTER_IN_NAME) {
         } else {
             dismissLoadingDialog();
             if (result.getCode() == ResultCode.INVALID_CHARACTER_IN_NAME) {


@@ -1359,13 +1363,23 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         OCFile renamedFile = operation.getFile();
         if (result.isSuccess()) {
             FileFragment details = getSecondFragment();
         OCFile renamedFile = operation.getFile();
         if (result.isSuccess()) {
             FileFragment details = getSecondFragment();

-            if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {
-                ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
+            if (details != null) 
+                if (details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {
+                    ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
+                    showDetails(renamedFile);
+                    
+            } else if (details instanceof PreviewMediaFragment && renamedFile.equals(details.getFile())) {
+                ((PreviewMediaFragment) details).updateFile(renamedFile);
+                if (PreviewMediaFragment.canBePreviewed(renamedFile)) {
+                    int position = ((PreviewMediaFragment)details).getPosition();
+                    startMediaPreview(renamedFile, position, true);
+                } else {
+                    getFileOperationsHelper().openFile(renamedFile);
+                }

             }
             }

+

             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {
             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {

-                /*
-                refeshListOfFilesFragment();
-                */
+                refreshListOfFilesFragment();

             }
 
         } else {
             }
 
         } else {


@@ -1401,9 +1415,6 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             
         } else {
             if (operation.transferWasRequested()) {
             
         } else {
             if (operation.transferWasRequested()) {

-                /*
-                refeshListOfFilesFragment();
-                */

                 onTransferStateChanged(syncedFile, true, true);
                 
             } else {
                 onTransferStateChanged(syncedFile, true, true);
                 
             } else {


@@ -1430,28 +1441,6 @@ OnSslUntrustedCertListener, EditNameDialogListener {
     }
 
 
     }
 
 

-    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;
-                RemoteOperation operation = new CreateFolderOperation(path, false, getStorageManager());
-                operation.execute(  getAccount(), 
-                        FileDisplayActivity.this, 
-                        FileDisplayActivity.this, 
-                        getHandler(),
-                        FileDisplayActivity.this);
-
-                showLoadingDialog();
-            }
-        }
-    }
-
-

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


@@ -1585,10 +1574,12 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         Account account = getAccount();
         if (mDownloaderBinder != null && mDownloaderBinder.isDownloading(account, file)) {
             mDownloaderBinder.cancel(account, file);
         Account account = getAccount();
         if (mDownloaderBinder != null && mDownloaderBinder.isDownloading(account, file)) {
             mDownloaderBinder.cancel(account, file);

+            refreshListOfFilesFragment();

             onTransferStateChanged(file, false, false);
 
         } else if (mUploaderBinder != null && mUploaderBinder.isUploading(account, file)) {
             mUploaderBinder.cancel(account, file);
             onTransferStateChanged(file, false, false);
 
         } else if (mUploaderBinder != null && mUploaderBinder.isUploading(account, file)) {
             mUploaderBinder.cancel(account, file);

+            refreshListOfFilesFragment();

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