Prevent stuck progress dialog

[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 da3ced9..5e1eeb5 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -188,6 +188,11 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         mRightFragmentContainer = findViewById(R.id.right_fragment_container);
         if (savedInstanceState == null) {
             createMinFragments();
         mRightFragmentContainer = findViewById(R.id.right_fragment_container);
         if (savedInstanceState == null) {
             createMinFragments();

+        } else {
+            Log_OC.d(TAG, "Init the secondFragment again");
+            if (mDualPane) {
+                initFragmentsWithFile();                
+            }

         }
 
         // Action bar setup
         }
 
         // Action bar setup


@@ -280,7 +285,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
         transaction.commit();
     }
         transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
         transaction.commit();
     }

-
+    

     private void initFragmentsWithFile() {
         if (getAccount() != null && getFile() != null) {
             /// First fragment
     private void initFragmentsWithFile() {
         if (getAccount() != null && getFile() != null) {
             /// First fragment


@@ -1353,6 +1358,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         if (result.isSuccess()) {
             refreshShowDetails();
             refeshListOfFilesFragment();
         if (result.isSuccess()) {
             refreshShowDetails();
             refeshListOfFilesFragment();

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

         }
     }
     
         }
     }
     


@@ -1364,12 +1372,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 file = getStorageManager().getFileByPath(file.getRemotePath()); {
                     if (!(details instanceof PreviewMediaFragment || details instanceof PreviewImageFragment)) {
                         showDetails(file);
                 file = getStorageManager().getFileByPath(file.getRemotePath()); {
                     if (!(details instanceof PreviewMediaFragment || details instanceof PreviewImageFragment)) {
                         showDetails(file);

-                    } else if (details instanceof PreviewMediaFragment) {                        
+                    } else if (details instanceof PreviewMediaFragment) {

                         startMediaPreview(file, 0, false);
                     } 
                 }
                 invalidateOptionsMenu();
                         startMediaPreview(file, 0, false);
                     } 
                 }
                 invalidateOptionsMenu();

-            }
+            } 

         }
     }
     
         }
     }