Fix, App crash after rotate the device previewing an image

[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 831c25f..8a64bce 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -195,9 +195,6 @@ public class FileDisplayActivity extends HookActivity
         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS,
                                                                 // according to the official
                                                                 // documentation
         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS,
                                                                 // according to the official
                                                                 // documentation

-        if (getFile() != null) {
-            updateActionBarTitle();
-        }

 
         setSupportProgressBarIndeterminateVisibility(mSyncInProgress
         /*|| mRefreshSharesInProgress*/);
 
         setSupportProgressBarIndeterminateVisibility(mSyncInProgress
         /*|| mRefreshSharesInProgress*/);


@@ -263,7 +260,7 @@ public class FileDisplayActivity extends HookActivity
                 
             } else {
                 updateFragmentsVisibility(!file.isFolder());
                 
             } else {
                 updateFragmentsVisibility(!file.isFolder());

-                updateNavigationElementsInActionBar(file.isFolder() ? null : file);
+                updateActionBarTitleAndHomeButton(file.isFolder() ? null : file);

             }
         }
     }
             }
         }
     }


@@ -294,7 +291,7 @@ public class FileDisplayActivity extends HookActivity
             if (secondFragment != null) {
                 setSecondFragment(secondFragment);
                 updateFragmentsVisibility(true);
             if (secondFragment != null) {
                 setSecondFragment(secondFragment);
                 updateFragmentsVisibility(true);

-                updateNavigationElementsInActionBar(file);
+                updateActionBarTitleAndHomeButton(file);

                 
             } else {
                 cleanSecondFragment();
                 
             } else {
                 cleanSecondFragment();


@@ -402,7 +399,7 @@ public class FileDisplayActivity extends HookActivity
             tr.commit();
         }
         updateFragmentsVisibility(false);
             tr.commit();
         }
         updateFragmentsVisibility(false);

-        updateNavigationElementsInActionBar(null);
+        updateActionBarTitleAndHomeButton(null);

     }
 
     protected void refreshListOfFilesFragment() {
     }
 
     protected void refreshListOfFilesFragment() {


@@ -736,6 +733,10 @@ public class FileDisplayActivity extends HookActivity
     public void onBackPressed() {
         OCFileListFragment listOfFiles = getListOfFilesFragment(); 
         if (mDualPane || getSecondFragment() == null) {
     public void onBackPressed() {
         OCFileListFragment listOfFiles = getListOfFilesFragment(); 
         if (mDualPane || getSecondFragment() == null) {

+            if (getFile() != null && getFile().getParentId() == 0) {
+                finish();
+                return;
+            }

             if (listOfFiles != null) {  // should never be null, indeed
                 listOfFiles.onBrowseUp();
             }
             if (listOfFiles != null) {  // should never be null, indeed
                 listOfFiles.onBrowseUp();
             }


@@ -743,7 +744,6 @@ public class FileDisplayActivity extends HookActivity
         if (listOfFiles != null) {  // should never be null, indeed
             setFile(listOfFiles.getCurrentFile());
         }
         if (listOfFiles != null) {  // should never be null, indeed
             setFile(listOfFiles.getCurrentFile());
         }

-        updateActionBarTitle();

         cleanSecondFragment();
 
     }
         cleanSecondFragment();
 
     }


@@ -1122,7 +1122,6 @@ public class FileDisplayActivity extends HookActivity
             // listOfFiles.listDirectory(root, MainApp.getOnlyOnDevice());
             setFile(listOfFiles.getCurrentFile());
             startSyncFolderOperation(root, false);
             // listOfFiles.listDirectory(root, MainApp.getOnlyOnDevice());
             setFile(listOfFiles.getCurrentFile());
             startSyncFolderOperation(root, false);

-            updateActionBarTitle();

         }
         cleanSecondFragment();
 
         }
         cleanSecondFragment();
 


@@ -1136,9 +1135,8 @@ public class FileDisplayActivity extends HookActivity
      */
     @Override
     public void onBrowsedDownTo(OCFile directory) {
      */
     @Override
     public void onBrowsedDownTo(OCFile directory) {

-        cleanSecondFragment();

         setFile(directory);
         setFile(directory);

-        updateActionBarTitle();
+        cleanSecondFragment();

         // Sync Folder
         startSyncFolderOperation(directory, false);
         
         // Sync Folder
         startSyncFolderOperation(directory, false);
         


@@ -1155,7 +1153,7 @@ public class FileDisplayActivity extends HookActivity
         Fragment detailFragment = new FileDetailFragment(file, getAccount());
         setSecondFragment(detailFragment);
         updateFragmentsVisibility(true);
         Fragment detailFragment = new FileDetailFragment(file, getAccount());
         setSecondFragment(detailFragment);
         updateFragmentsVisibility(true);

-        updateNavigationElementsInActionBar(file);
+        updateActionBarTitleAndHomeButton(file);

         setFile(file);
     }
 
         setFile(file);
     }
 


@@ -1163,7 +1161,7 @@ public class FileDisplayActivity extends HookActivity
     /**
      * TODO
      */
     /**
      * TODO
      */

-    private void updateNavigationElementsInActionBar(OCFile chosenFile) {
+    private void updateActionBarTitleAndHomeButton(OCFile chosenFile) {

         ActionBar actionBar = getSupportActionBar();
 
         // For adding content description tag to a title field in the action bar
         ActionBar actionBar = getSupportActionBar();
 
         // For adding content description tag to a title field in the action bar


@@ -1173,10 +1171,11 @@ public class FileDisplayActivity extends HookActivity
             // only list of files - set for browsing through folders
             OCFile currentDir = getCurrentDir();
             boolean noRoot = (currentDir != null && currentDir.getParentId() != 0);
             // only list of files - set for browsing through folders
             OCFile currentDir = getCurrentDir();
             boolean noRoot = (currentDir != null && currentDir.getParentId() != 0);

-//            actionBar.setDisplayHomeAsUpEnabled(noRoot);
-//            actionBar.setDisplayShowTitleEnabled(!noRoot);
+            //actionBar.setDisplayHomeAsUpEnabled(noRoot);
+            //actionBar.setDisplayShowTitleEnabled(!noRoot);

             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);

+            mDrawerToggle.setDrawerIndicatorEnabled(!noRoot);

             if (!noRoot) {
                 actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
                 View actionBarTitleView = getWindow().getDecorView().findViewById(actionBarTitleId);
             if (!noRoot) {
                 actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
                 View actionBarTitleView = getWindow().getDecorView().findViewById(actionBarTitleId);


@@ -1190,6 +1189,7 @@ public class FileDisplayActivity extends HookActivity
         } else {
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
         } else {
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);

+            mDrawerToggle.setDrawerIndicatorEnabled(false);

             actionBar.setTitle(chosenFile.getFileName());
             actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
             View actionBarTitleView = getWindow().getDecorView().findViewById(actionBarTitleId);
             actionBar.setTitle(chosenFile.getFileName());
             actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
             View actionBarTitleView = getWindow().getDecorView().findViewById(actionBarTitleId);


@@ -1661,7 +1661,7 @@ public class FileDisplayActivity extends HookActivity
                 autoplay);
         setSecondFragment(mediaFragment);
         updateFragmentsVisibility(true);
                 autoplay);
         setSecondFragment(mediaFragment);
         updateFragmentsVisibility(true);

-        updateNavigationElementsInActionBar(file);
+        updateActionBarTitleAndHomeButton(file);

         setFile(file);
     }
 
         setFile(file);
     }
 


@@ -1678,7 +1678,7 @@ public class FileDisplayActivity extends HookActivity
         mWaitingToPreview = file;
         requestForDownload();
         updateFragmentsVisibility(true);
         mWaitingToPreview = file;
         requestForDownload();
         updateFragmentsVisibility(true);

-        updateNavigationElementsInActionBar(file);
+        updateActionBarTitleAndHomeButton(file);

         setFile(file);
     }
 
         setFile(file);
     }