Merge branch 'share_link_show_shared_files' into share_link__code_improvements
authormasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 10:14:19 +0000 (11:14 +0100)
committermasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 10:14:19 +0000 (11:14 +0100)
1  2 
owncloud-android-library
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit b4d67521b24bbd517cc1c91b37715ad650688bc3
 -Subproject commit 7b5d6cdef791cd27a573fcaa9c8214970753843c
++Subproject commit 7126c73e6324ca8d3615fc4757191848e03d5644
@@@ -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);
+         }
      }
  
      /**
      }
  
      
 -    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) {