Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / CreateShareOperation.java

diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java
index e2848d5..7cdcc08 100644 (file)
--- a/src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/src/com/owncloud/android/operations/CreateShareOperation.java
@@ -27,7 +27,6 @@ package com.owncloud.android.operations;
 import android.content.Context;
 import android.content.Intent;
 
 import android.content.Context;
 import android.content.Intent;
 

-import com.owncloud.android.MainApp;

 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;


@@ -100,12 +99,12 @@ public class CreateShareOperation extends SyncOperation {
         // Check if the share link already exists
         operation = new GetRemoteSharesForFileOperation(mPath, false, false);
         RemoteOperationResult result =
         // Check if the share link already exists
         operation = new GetRemoteSharesForFileOperation(mPath, false, false);
         RemoteOperationResult result =

-                ((GetRemoteSharesForFileOperation)operation).execute(client, MainApp.getUserAgent());
+                ((GetRemoteSharesForFileOperation)operation).execute(client);

 
         if (!result.isSuccess() || result.getData().size() <= 0) {
             operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload,
                     mPassword, mPermissions);
 
         if (!result.isSuccess() || result.getData().size() <= 0) {
             operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload,
                     mPassword, mPermissions);

-            result = ((CreateRemoteShareOperation)operation).execute(client, MainApp.getUserAgent());
+            result = ((CreateRemoteShareOperation)operation).execute(client);

         }
         
         if (result.isSuccess()) {
         }
         
         if (result.isSuccess()) {


@@ -162,7 +161,8 @@ public class CreateShareOperation extends SyncOperation {
         OCFile file = getStorageManager().getFileByPath(mPath);
         if (file!=null) {
             mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
         OCFile file = getStorageManager().getFileByPath(mPath);
         if (file!=null) {
             mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());

-            mSendIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(mContext.getString(R.string.subject_token),
+            mSendIntent.putExtra(Intent.EXTRA_SUBJECT,
+                    String.format(mContext.getString(R.string.subject_token),

                     getClient().getCredentials().getUsername(), file.getFileName()));
             file.setPublicLink(share.getShareLink());
             file.setShareByLink(true);
                     getClient().getCredentials().getUsername(), file.getFileName()));
             file.setPublicLink(share.getShareLink());
             file.setShareByLink(true);