Merge branch 'share_link_show_shared_files' into share_link__new_share

[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 5a324a5..676e90a 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -73,8 +73,10 @@ import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
 import com.owncloud.android.lib.operations.common.RemoteOperation;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
 import com.owncloud.android.lib.operations.common.RemoteOperation;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult;

+import com.owncloud.android.lib.operations.common.ShareType;

 import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 
 import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 

+import com.owncloud.android.operations.CreateShareOperation;

 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;


@@ -933,13 +935,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);
 
             if (getAccount() != null && accountName.equals(getAccount().name)
             RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);
 
             if (getAccount() != null && accountName.equals(getAccount().name)

-                    && mStorageManager != null
-                    ) {  
-
-                /// get the shared files
-                if (isSharedSupported()) {
-                    startGetShares();
-                }
+                    && mStorageManager != null) {

                 
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 
                 
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 


@@ -971,6 +967,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 }
                 
                 if (!mRefreshSharesInProgress) {
                 }
                 
                 if (!mRefreshSharesInProgress) {

+                    /// get the shared files
+                    if (isSharedSupported()) {
+                        startGetShares();
+                    }

                     setSupportProgressBarIndeterminateVisibility(inProgress);
                 } else {
                     setSupportProgressBarIndeterminateVisibility(true);
                     setSupportProgressBarIndeterminateVisibility(inProgress);
                 } else {
                     setSupportProgressBarIndeterminateVisibility(true);


@@ -1569,5 +1569,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         setSupportProgressBarIndeterminateVisibility(true);
         
     }
         setSupportProgressBarIndeterminateVisibility(true);
         
     }

+
+    @Override
+    public void shareFileWithLink(OCFile file) {
+            CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1);
+            createShare.execute(getAccount(), this, this, mHandler, this);
+        
+    }

     
 }
     
 }