Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update...

[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 f6136ed..c594717 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -215,7 +215,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     protected void onStart() {
         super.onStart();
         getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
     protected void onStart() {
         super.onStart();
         getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());

+        /*

         refeshListOfFilesFragment();
         refeshListOfFilesFragment();

+        */

     }
 
     @Override
     }
 
     @Override


@@ -416,12 +418,14 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         updateNavigationElementsInActionBar(null);
     }
 
         updateNavigationElementsInActionBar(null);
     }
 

+    /* TODO WIP COMMENT 

     protected void refeshListOfFilesFragment() {
         OCFileListFragment fileListFragment = getListOfFilesFragment();
         if (fileListFragment != null) { 
             fileListFragment.listDirectory();
         }
     }
     protected void refeshListOfFilesFragment() {
         OCFileListFragment fileListFragment = getListOfFilesFragment();
         if (fileListFragment != null) { 
             fileListFragment.listDirectory();
         }
     }

+    */

 
     protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath, boolean success) {
         FileFragment secondFragment = getSecondFragment();
 
     protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath, boolean success) {
         FileFragment secondFragment = getSecondFragment();


@@ -940,13 +944,15 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                                 cleanSecondFragment();
                                 currentFile = currentDir;
                             }
                                 cleanSecondFragment();
                                 currentFile = currentDir;
                             }

-                        
+
+                            /* TODO WIP COMMENT 

                             if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) {
                                 OCFileListFragment fileListFragment = getListOfFilesFragment();
                                 if (fileListFragment != null) {
                                     fileListFragment.listDirectory(currentDir);
                                 }
                             }
                             if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) {
                                 OCFileListFragment fileListFragment = getListOfFilesFragment();
                                 if (fileListFragment != null) {
                                     fileListFragment.listDirectory(currentDir);
                                 }
                             }

+                            */

                             setFile(currentFile);
                         }
                         
                             setFile(currentFile);
                         }
                         


@@ -999,7 +1005,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             OCFile currentDir = getCurrentDir();
             boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
             if (sameAccount && isDescendant) {
             OCFile currentDir = getCurrentDir();
             boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
             if (sameAccount && isDescendant) {

+                /*

                 refeshListOfFilesFragment();
                 refeshListOfFilesFragment();

+                */

             }
         }
 
             }
         }
 


@@ -1020,7 +1028,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             boolean isDescendant = isDescendant(downloadedRemotePath);
 
             if (sameAccount && isDescendant) {
             boolean isDescendant = isDescendant(downloadedRemotePath);
 
             if (sameAccount && isDescendant) {

+                /* TODO WIP COMMENT 

                 refeshListOfFilesFragment();
                 refeshListOfFilesFragment();

+                */

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


@@ -1069,7 +1079,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 if (getAccount() != null && account.name.equals(getAccount().name)
                         && getStorageManager() != null
                         ) {
                 if (getAccount() != null && account.name.equals(getAccount().name)
                         && getStorageManager() != null
                         ) {

+                    /*

                     refeshListOfFilesFragment();
                     refeshListOfFilesFragment();

+                    */

                 }
                 if ((getSharesResult != null) &&
                         RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED.equals(getSharesResult.getCode())) {
                 }
                 if ((getSharesResult != null) &&
                         RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED.equals(getSharesResult.getCode())) {


@@ -1224,10 +1236,13 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */

+    

     @Override
     public void onFileStateChanged() {
     @Override
     public void onFileStateChanged() {

+        /* TODO WIP COMMENT 

         refeshListOfFilesFragment();
         updateNavigationElementsInActionBar(getSecondFragment().getFile());
         refeshListOfFilesFragment();
         updateNavigationElementsInActionBar(getSecondFragment().getFile());

+        */

     }
 
 
     }
 
 


@@ -1362,7 +1377,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     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();
             refeshListOfFilesFragment();

+            */

         }
     }
 
         }
     }
 


@@ -1370,10 +1387,14 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();
     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshShowDetails();

+            /*

             refeshListOfFilesFragment();
             refeshListOfFilesFragment();

+            */

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

+            /*

             refeshListOfFilesFragment();
             refeshListOfFilesFragment();

+            */

         }
     }
     
         }
     }
     


@@ -1413,7 +1434,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 cleanSecondFragment();
             }
             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
                 cleanSecondFragment();
             }
             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {

+                /*

                 refeshListOfFilesFragment();
                 refeshListOfFilesFragment();

+                */

             }
 
         } else {
             }
 
         } else {


@@ -1435,7 +1458,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     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();
             refeshListOfFilesFragment();

+            */

 
         } else {
             dismissLoadingDialog();
 
         } else {
             dismissLoadingDialog();


@@ -1472,7 +1497,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 }
             }
             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {
                 }
             }
             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {

+                /*

                 refeshListOfFilesFragment();
                 refeshListOfFilesFragment();

+                */

             }
 
         } else {
             }
 
         } else {


@@ -1509,7 +1536,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
         } else {
             if (operation.transferWasRequested()) {
 
         } else {
             if (operation.transferWasRequested()) {

+                /*

                 refeshListOfFilesFragment();
                 refeshListOfFilesFragment();

+                */

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