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?ds=inline;hp=-c

Merge branch 'share_link_show_shared_files' into share_link__code_improvements
---

7c0accf714ec85a08c70747cf8d84dbada817a67
diff --combined 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 --combined 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
@@@ -21,6 -21,7 +21,6 @@@ package com.owncloud.android.ui.activit
  import java.io.File;
  
  import android.accounts.Account;
 -import android.accounts.AccountManager;
  import android.app.AlertDialog;
  import android.app.Dialog;
  import android.app.ProgressDialog;
@@@ -69,8 -70,9 +69,8 @@@ import com.owncloud.android.files.servi
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.operations.CreateFolderOperation;
  
 -import com.owncloud.android.operations.GetSharedFilesOperation;
 +import com.owncloud.android.operations.GetSharesOperation;
  
 -import com.owncloud.android.lib.accounts.OwnCloudAccount;
  import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
  import com.owncloud.android.lib.operations.common.RemoteOperation;
  import com.owncloud.android.lib.operations.common.RemoteOperationResult;
@@@ -125,6 -127,7 +125,7 @@@ OCFileListFragment.ContainerActivity, F
  
      private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
      private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS";
+     private static final String KEY_REFRESH_SHARES_IN_PROGRESS = "SHARES_IN_PROGRESS";
  
      public static final int DIALOG_SHORT_WAIT = 0;
      private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
@@@ -147,6 -150,7 +148,7 @@@
      private Handler mHandler;
      
      private boolean mSyncInProgress = false;
+     private boolean mRefreshSharesInProgress = false;
  
      @Override
      protected void onCreate(Bundle savedInstanceState) {
@@@ -179,10 -183,12 +181,12 @@@
          if(savedInstanceState != null) {
              mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
              mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
+             mRefreshSharesInProgress = savedInstanceState.getBoolean(KEY_REFRESH_SHARES_IN_PROGRESS);
             
          } else {
              mWaitingToPreview = null;
              mSyncInProgress = false;
+             mRefreshSharesInProgress = false;
          }        
  
          /// USER INTERFACE
@@@ -672,6 -678,7 +676,7 @@@
          super.onSaveInstanceState(outState);
          outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
          outState.putBoolean(FileDisplayActivity.KEY_SYNC_IN_PROGRESS, mSyncInProgress);
+         outState.putBoolean(FileDisplayActivity.KEY_REFRESH_SHARES_IN_PROGRESS, mRefreshSharesInProgress);
  
          Log_OC.d(TAG, "onSaveInstanceState() end");
      }
@@@ -923,7 -930,7 +928,7 @@@
  
                  /// get the shared files
                  if (isSharedSupported()) {
 -                    startGetSharedFiles();
 +                    startGetShares();
                  }
                  
                  String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
@@@ -955,7 -962,12 +960,12 @@@
                      setFile(currentFile);
                  }
                  
-                 setSupportProgressBarIndeterminateVisibility(inProgress);
+                 if (!mRefreshSharesInProgress) {
+                     setSupportProgressBarIndeterminateVisibility(inProgress);
+                 } else {
+                     setSupportProgressBarIndeterminateVisibility(true);
+                 }
+                 
                  removeStickyBroadcast(intent);
                  mSyncInProgress = inProgress;
  
@@@ -1288,8 -1300,8 +1298,8 @@@
          } else if (operation instanceof CreateFolderOperation) {
              onCreateFolderOperationFinish((CreateFolderOperation)operation, result);
              
 -        } else if (operation instanceof GetSharedFilesOperation) {
 -            onGetSharedFilesOperationFinish((GetSharedFilesOperation) operation, result);
 +        } else if (operation instanceof GetSharesOperation) {
 +            onGetSharesOperationFinish((GetSharesOperation) operation, result);
          }
      }
  
@@@ -1299,11 -1311,15 +1309,15 @@@
       * @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) {