From: masensio <masensio@solidgear.es>
Date: Fri, 30 May 2014 12:16:33 +0000 (+0200)
Subject: Merge branch 'develop' into pull_down_refresh
X-Git-Tag: oc-android-1.7.0_signed~292^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ca555b2cd87b8728c61dce808ccec1215e4caf2b?hp=-c

Merge branch 'develop' into pull_down_refresh
---

ca555b2cd87b8728c61dce808ccec1215e4caf2b
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ae38805c,4babd9db..ee7d3247
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -181,11 -181,6 +181,6 @@@ FileFragment.ContainerActivity, OnNavig
          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
@@@ -927,15 -922,6 +922,15 @@@
                          removeStickyBroadcast(intent);
                          Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
                          setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
 +                        
 +                        if (mSyncInProgress) {
 +                            getListOfFilesFragment().disableSwipe();
 +                            
 +                        } else {
 +                            getListOfFilesFragment().enableSwipe();
 +                            getListOfFilesFragment().hideSwipeProgress();
 +                        }
 +                        
                  }
                  
                  if (synchResult != null) {