Fixed behaviour when user enters in a folder deleted in the server before the app...

[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 bacc6a9..f886732 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -880,15 +880,19 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
                 if ((synchFolderRemotePath != null && currentDir != null && (currentDir.getRemotePath().equals(synchFolderRemotePath)))
                         || fillBlankRoot ) {
-                    if (!fillBlankRoot) 
-                        currentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
-                    OCFileListFragment fileListFragment = getListOfFilesFragment();
-                    if (fileListFragment != null) {
-                        fileListFragment.listDirectory(currentDir);
-                        
+                    if (synchResult == null || synchResult.isSuccess()) {
+                        if (!fillBlankRoot) 
+                            currentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
+                        if (currentDir != null) {
+                            OCFileListFragment fileListFragment = getListOfFilesFragment();
+                            if (fileListFragment != null) {
+                                fileListFragment.listDirectory(currentDir);
+                                
+                            }
+                            if (getSecondFragment() == null)
+                                setFile(currentDir);
+                        }
                     }
-                    if (getSecondFragment() == null)
-                        setFile(currentDir);
                 }
                 
                 setSupportProgressBarIndeterminateVisibility(inProgress);