From: masensio <masensio@solidgear.es>
Date: Wed, 29 Jan 2014 10:14:19 +0000 (+0100)
Subject: Merge branch 'share_link_show_shared_files' into share_link__code_improvements
X-Git-Tag: oc-android-1.5.5~35^2~43^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7c0accf714ec85a08c70747cf8d84dbada817a67?hp=--cc

Merge branch 'share_link_show_shared_files' into share_link__code_improvements
---

7c0accf714ec85a08c70747cf8d84dbada817a67
diff --cc owncloud-android-library
index b4d67521,7b5d6cde..7126c73e
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit b4d67521b24bbd517cc1c91b37715ad650688bc3
 -Subproject commit 7b5d6cdef791cd27a573fcaa9c8214970753843c
++Subproject commit 7126c73e6324ca8d3615fc4757191848e03d5644
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 0b5264bc,1168c75e..0eb1966c
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -1299,11 -1311,15 +1309,15 @@@ OCFileListFragment.ContainerActivity, F
       * @param operation     Get Shared Files
       * @param result        Result of the operation
       */
 -    private void onGetSharedFilesOperationFinish(GetSharedFilesOperation operation, RemoteOperationResult result) {
 +    private void onGetSharesOperationFinish(GetSharesOperation operation, RemoteOperationResult result) {
-         // TODO
          // Refresh the filelist with the information
-         refeshListOfFilesFragment();    
+         refeshListOfFilesFragment();  
+         
+         mRefreshSharesInProgress = false;
          
+         if (!mSyncInProgress) {
+             setSupportProgressBarIndeterminateVisibility(false);
+         }
      }
  
      /**
@@@ -1515,11 -1531,17 +1529,14 @@@
      }
  
      
 -    private void startGetSharedFiles() {
 +    private void startGetShares() {
          // Get shared files/folders
 -        AccountManager accountMngr = AccountManager.get(this); 
 -        String urlServer = accountMngr.getUserData(getAccount(), OwnCloudAccount.Constants.KEY_OC_BASE_URL);
 -        
 -        RemoteOperation getSharedFiles = new GetSharedFilesOperation(urlServer, mStorageManager);
 -        getSharedFiles.execute(getAccount(), this, this, mHandler, this);
 +        RemoteOperation getShares = new GetSharesOperation(mStorageManager);
 +        getShares.execute(getAccount(), this, this, mHandler, this);
          
+         mRefreshSharesInProgress = true;
+         setSupportProgressBarIndeterminateVisibility(true);
+         
      }
      
  //    public void enableDisableViewGroup(ViewGroup viewGroup, boolean enabled) {