Enable necessary refresh in FileDisplayActivity. Delete onFileStateChanged in Contain...

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 2fbf1b8..df56c13 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -209,7 +209,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         super.onStart();
         getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
         /*
         super.onStart();
         getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
         /*

-        refeshListOfFilesFragment();
+        refreshListOfFilesFragment();

         */
     }
 
         */
     }
 


@@ -407,14 +407,12 @@ OnSslUntrustedCertListener, EditNameDialogListener {
         updateNavigationElementsInActionBar(null);
     }
 
         updateNavigationElementsInActionBar(null);
     }
 

-    /* TODO WIP COMMENT 
-    protected void refeshListOfFilesFragment() {
+    protected void refreshListOfFilesFragment() {

         OCFileListFragment fileListFragment = getListOfFilesFragment();
         if (fileListFragment != null) { 
             fileListFragment.listDirectory();
         }
     }
         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();


@@ -934,14 +932,14 @@ OnSslUntrustedCertListener, EditNameDialogListener {
                                 currentFile = currentDir;
                             }
 
                                 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,9 +997,9 @@ 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);


@@ -1056,9 +1054,9 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             boolean isDescendant = isDescendant(downloadedRemotePath);
 
             if (sameAccount && isDescendant) {
             boolean isDescendant = isDescendant(downloadedRemotePath);
 
             if (sameAccount && isDescendant) {

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

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


@@ -1213,17 +1211,19 @@ OnSslUntrustedCertListener, EditNameDialogListener {
     }
 
 
     }
 
 

-    /**
-     * {@inheritDoc}
-     */
-    
-    @Override
-    public void onFileStateChanged() {
-        /* TODO WIP COMMENT 
-        refeshListOfFilesFragment();
-        updateNavigationElementsInActionBar(getSecondFragment().getFile());
-        */
-    }
+    // TODO: delete this method??
+//    /**
+//     * {@inheritDoc}
+//     */
+//    
+//    @Override
+//    public void onFileStateChanged() {
+//        /* TODO WIP COMMENT 
+//        refeshListOfFilesFragment();
+//        updateNavigationElementsInActionBar(getSecondFragment().getFile());
+//        */
+//    }
+//    

 
 
     @Override
 
 
     @Override


@@ -1344,9 +1344,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();

         }
     }
 
         }
     }
 


@@ -1354,14 +1352,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();

         }
     }
     
         }
     }
     


@@ -1400,9 +1395,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
                 cleanSecondFragment();
             }
             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
                 cleanSecondFragment();
             }
             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {

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

             }
 
         } else {
             }
 
         } else {


@@ -1425,10 +1418,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) {


@@ -1462,9 +1452,7 @@ OnSslUntrustedCertListener, EditNameDialogListener {
                 ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
             }
             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {
                 ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
             }
             if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {

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

             }
 
         } else {
             }
 
         } else {


@@ -1500,9 +1488,9 @@ OnSslUntrustedCertListener, EditNameDialogListener {
             
         } else {
             if (operation.transferWasRequested()) {
             
         } else {
             if (operation.transferWasRequested()) {

-                /*
-                refeshListOfFilesFragment();
-                */
+                /* WIP: delete this refresh?
+                 * refreshListOfFilesFragment();
+                 */

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

diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java
index 12f2263..fa69491 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileFragment.java
@@ -141,19 +141,19 @@ public class FileFragment extends SherlockFragment {
         public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading); 
 
         
         public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading); 
 
         

-        /**
-         * Callback method invoked when the detail fragment wants to notice its container 
-         * activity about a relevant state the file shown by the fragment.
-         * 
-         * Added to notify to FileDisplayActivity about the need of refresh the files list. 
-         * 
-         * Currently called when:
-         *  - a download is started;
-         *  - a rename is completed;
-         *  - a deletion is completed;
-         *  - the 'inSync' flag is changed;
-         */
-        public void onFileStateChanged();
+//        /**
+//         * Callback method invoked when the detail fragment wants to notice its container 
+//         * activity about a relevant state the file shown by the fragment.
+//         * 
+//         * Added to notify to FileDisplayActivity about the need of refresh the files list. 
+//         * 
+//         * Currently called when:
+//         *  - a download is started;
+//         *  - a rename is completed;
+//         *  - a deletion is completed;
+//         *  - the 'inSync' flag is changed;
+//         */
+//        public void onFileStateChanged();

 
         
     }
 
         
     }

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index df1f143..f8621e4 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -469,13 +469,13 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener {
         
     }
 
         
     }
 

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onFileStateChanged() {
-        // nothing to do here!
-    }
+//    /**
+//     * {@inheritDoc}
+//     */
+//    @Override
+//    public void onFileStateChanged() {
+//        // nothing to do here!
+//    }

 
     
 }
 
     
 }