Merge branch 'develop' into pull_down_refresh

[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 537ed74..ee7d324 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -181,11 +181,6 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
         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


@@ -929,11 +924,13 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
                         setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
                         
                         if (mSyncInProgress) {
                         setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
                         
                         if (mSyncInProgress) {

-                            getListOfFilesFragment().showSwipeProgress();
+                            getListOfFilesFragment().disableSwipe();

                             
                         } else {
                             
                         } else {

+                            getListOfFilesFragment().enableSwipe();

                             getListOfFilesFragment().hideSwipeProgress();
                         }
                             getListOfFilesFragment().hideSwipeProgress();
                         }

+                        

                 }
                 
                 if (synchResult != null) {
                 }
                 
                 if (synchResult != null) {