PreviewVideoActivity protected against access to non-exiting account

[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 9fc631a..ae8c920 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -215,7 +215,7 @@ public class FileDisplayActivity extends FileActivity implements
                 file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);  // never returns null
             }
             setFile(file);
                 file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);  // never returns null
             }
             setFile(file);

-            
+            mDirectories.clear();

             while(file != null && file.getFileName() != OCFile.PATH_SEPARATOR) {
                 if (file.isDirectory()) {
                     mDirectories.add(file.getFileName());
             while(file != null && file.getFileName() != OCFile.PATH_SEPARATOR) {
                 if (file.isDirectory()) {
                     mDirectories.add(file.getFileName());


@@ -248,6 +248,11 @@ public class FileDisplayActivity extends FileActivity implements
             Fragment secondFragment = chooseInitialSecondFragment(file);
             if (secondFragment != null) {
                 setSecondFragment(secondFragment);
             Fragment secondFragment = chooseInitialSecondFragment(file);
             if (secondFragment != null) {
                 setSecondFragment(secondFragment);

+                updateFragmentsVisibility(true);
+                updateNavigationElementsInActionBar(file);
+                
+            } else {
+                cleanSecondFragment();

             }
             
         } else {
             }
             
         } else {


@@ -343,8 +348,9 @@ public class FileDisplayActivity extends FileActivity implements
             FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
             tr.remove(second);
             tr.commit();
             FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
             tr.remove(second);
             tr.commit();

-            updateFragmentsVisibility(false);

         }
         }

+        updateFragmentsVisibility(false);
+        updateNavigationElementsInActionBar(null);

     }
     
     protected void refeshListOfFilesFragment() {
     }
     
     protected void refeshListOfFilesFragment() {


@@ -569,7 +575,6 @@ public class FileDisplayActivity extends FileActivity implements
             setFile(listOfFiles.getCurrentFile());
         }
         cleanSecondFragment();
             setFile(listOfFiles.getCurrentFile());
         }
         cleanSecondFragment();

-        updateNavigationElementsInActionBar(null);

     }
 
     @Override
     }
 
     @Override


@@ -581,13 +586,6 @@ public class FileDisplayActivity extends FileActivity implements
         Log_OC.d(TAG, "onSaveInstanceState() end");
     }
 
         Log_OC.d(TAG, "onSaveInstanceState() end");
     }
 

-    @Override
-    protected void onStart() {
-        super.onStart();
-        FileFragment second = getSecondFragment();
-        updateFragmentsVisibility(second != null);
-        updateNavigationElementsInActionBar((second == null) ? null : second.getFile());
-    }

     
     @Override
     protected void onResume() {
     
     @Override
     protected void onResume() {


@@ -921,7 +919,6 @@ public class FileDisplayActivity extends FileActivity implements
     public void onBrowsedDownTo(OCFile directory) {
         pushDirname(directory);
         cleanSecondFragment();
     public void onBrowsedDownTo(OCFile directory) {
         pushDirname(directory);
         cleanSecondFragment();

-        updateNavigationElementsInActionBar(null);

     }
     
     /**
     }
     
     /**