Removed useless code

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / FileOperationsHelper.java

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 2f0e16c..013fed9 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -48,7 +48,6 @@ import com.owncloud.android.ui.activity.ShareActivity;
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 

-import org.apache.http.protocol.HTTP;

 
 import java.util.List;
 
 
 import java.util.List;
 


@@ -187,33 +186,8 @@ public class FileOperationsHelper {
                 mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
             } else {
                 mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
             } else {

-                Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
-            }
-        } else {
-            // Show a Message
-            Toast t = Toast.makeText(
-                    mFileActivity, mFileActivity.getString(R.string.share_link_no_support_share_api),
-                    Toast.LENGTH_LONG
-            );
-            t.show();
-        }
-    }
-
-    public void shareFileWithLinkOLD(OCFile file) {
-
-        if (isSharedSupported()) {
-            if (file != null) {
-                String link = "https://fake.url";
-                Intent intent = createShareWithLinkIntent(link);
-                String[] packagesToExclude = new String[]{mFileActivity.getPackageName()};
-                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intent,
-                        packagesToExclude, file);
-                chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
-
-            } else {

                 Log_OC.wtf(TAG, "Trying to share a NULL OCFile");
             }
                 Log_OC.wtf(TAG, "Trying to share a NULL OCFile");
             }

-

         } else {
             // Show a Message
             Toast t = Toast.makeText(
         } else {
             // Show a Message
             Toast t = Toast.makeText(


@@ -224,7 +198,6 @@ public class FileOperationsHelper {
         }
     }
 
         }
     }
 

-

     public void shareFileWithLinkToApp(OCFile file, String password, Intent sendIntent) {
         
         if (file != null) {
     public void shareFileWithLinkToApp(OCFile file, String password, Intent sendIntent) {
         
         if (file != null) {


@@ -244,15 +217,6 @@ public class FileOperationsHelper {
         }
     }
 
         }
     }
 

-
-    private Intent createShareWithLinkIntent(String link) {
-        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
-        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
-        intentToShareLink.setType(HTTP.PLAIN_TEXT_TYPE);
-        return intentToShareLink;
-    }
-
-

     /**
      * Helper method to share a file with a known sharee. Starts a request to do it in {@link OperationsService}
      *
     /**
      * Helper method to share a file with a known sharee. Starts a request to do it in {@link OperationsService}
      *


@@ -365,10 +329,7 @@ public class FileOperationsHelper {
      */
     public void requestPasswordForShareViaLink(OCFile file) {
         SharePasswordDialogFragment dialog =
      */
     public void requestPasswordForShareViaLink(OCFile file) {
         SharePasswordDialogFragment dialog =

-                SharePasswordDialogFragment.newInstance(
-                        file,
-                        null
-                );
+                SharePasswordDialogFragment.newInstance(file);

         dialog.show(
                 mFileActivity.getSupportFragmentManager(),
                 SharePasswordDialogFragment.PASSWORD_FRAGMENT
         dialog.show(
                 mFileActivity.getSupportFragmentManager(),
                 SharePasswordDialogFragment.PASSWORD_FRAGMENT


@@ -442,8 +403,7 @@ public class FileOperationsHelper {
 
             // Show dialog, without the own app
             String[] packagesToExclude = new String[]{mFileActivity.getPackageName()};
 
             // Show dialog, without the own app
             String[] packagesToExclude = new String[]{mFileActivity.getPackageName()};

-            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent,
-                    packagesToExclude, file);
+            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude);

             chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
 
         } else {
             chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
 
         } else {