Removed useless code

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 0e44794..013fed9 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -329,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


@@ -406,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 {

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 58dd595..563dbb1 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -796,8 +796,7 @@ public class FileActivity extends AppCompatActivity
             if (result.getCode() == ResultCode.SHARE_FORBIDDEN) {
                 if (!isTryShareAgain()) {
                     SharePasswordDialogFragment dialog =
             if (result.getCode() == ResultCode.SHARE_FORBIDDEN) {
                 if (!isTryShareAgain()) {
                     SharePasswordDialogFragment dialog =

-                            SharePasswordDialogFragment.newInstance(new OCFile(operation.getPath()),
-                                    operation.getSendIntent());
+                            SharePasswordDialogFragment.newInstance(new OCFile(operation.getPath()));

                     dialog.show(getSupportFragmentManager(), DIALOG_SHARE_PASSWORD);
                 } else {
                     Toast t = Toast.makeText(this,
                     dialog.show(getSupportFragmentManager(), DIALOG_SHARE_PASSWORD);
                 } else {
                     Toast t = Toast.makeText(this,

diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index 0098da4..047e62d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -173,8 +173,7 @@ public class ShareActivity extends FileActivity
                 intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
                 intentToShareLink.setType(HTTP.PLAIN_TEXT_TYPE);
                 String[] packagesToExclude = new String[]{getPackageName()};
                 intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
                 intentToShareLink.setType(HTTP.PLAIN_TEXT_TYPE);
                 String[] packagesToExclude = new String[]{getPackageName()};

-                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink,
-                        packagesToExclude, getFile());
+                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);

                 chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
             }
         }
                 chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
             }
         }

diff --git a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
index b4c08e3..29eaac2 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@ -44,10 +44,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
 import android.widget.TextView;
 
 import com.owncloud.android.R;

-import com.owncloud.android.datamodel.OCFile;

 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.CopyToClipboardActivity;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.CopyToClipboardActivity;

-import com.owncloud.android.ui.activity.FileActivity;

 
 /**
  * Dialog showing a list activities able to resolve a given Intent, 
 
 /**
  * Dialog showing a list activities able to resolve a given Intent, 


@@ -60,20 +58,15 @@ public class ShareLinkToDialog  extends DialogFragment {
             ".ARG_INTENT";
     private final static String ARG_PACKAGES_TO_EXCLUDE =  ShareLinkToDialog.class.getSimpleName() +
             ".ARG_PACKAGES_TO_EXCLUDE";
             ".ARG_INTENT";
     private final static String ARG_PACKAGES_TO_EXCLUDE =  ShareLinkToDialog.class.getSimpleName() +
             ".ARG_PACKAGES_TO_EXCLUDE";

-    private final static String ARG_FILE_TO_SHARE = ShareLinkToDialog.class.getSimpleName() +
-            ".FILE_TO_SHARE";
-    
+

     private ActivityAdapter mAdapter;
     private ActivityAdapter mAdapter;

-    private OCFile mFile;

     private Intent mIntent;
     
     private Intent mIntent;
     

-    public static ShareLinkToDialog newInstance(Intent intent, String[] packagesToExclude,
-                                                OCFile fileToShare) {
+    public static ShareLinkToDialog newInstance(Intent intent, String[] packagesToExclude) {

         ShareLinkToDialog f = new ShareLinkToDialog();
         Bundle args = new Bundle();
         args.putParcelable(ARG_INTENT, intent);
         args.putStringArray(ARG_PACKAGES_TO_EXCLUDE, packagesToExclude);
         ShareLinkToDialog f = new ShareLinkToDialog();
         Bundle args = new Bundle();
         args.putParcelable(ARG_INTENT, intent);
         args.putStringArray(ARG_PACKAGES_TO_EXCLUDE, packagesToExclude);

-        args.putParcelable(ARG_FILE_TO_SHARE, fileToShare);

         f.setArguments(args);
         return f;
     }
         f.setArguments(args);
         return f;
     }


@@ -89,8 +82,7 @@ public class ShareLinkToDialog  extends DialogFragment {
         String[] packagesToExclude = getArguments().getStringArray(ARG_PACKAGES_TO_EXCLUDE);
         List<String> packagesToExcludeList = Arrays.asList(packagesToExclude != null ?
                 packagesToExclude : new String[0]);
         String[] packagesToExclude = getArguments().getStringArray(ARG_PACKAGES_TO_EXCLUDE);
         List<String> packagesToExcludeList = Arrays.asList(packagesToExclude != null ?
                 packagesToExclude : new String[0]);

-        mFile = getArguments().getParcelable(ARG_FILE_TO_SHARE);
-        
+

         PackageManager pm= getActivity().getPackageManager();
         List<ResolveInfo> activities = pm.queryIntentActivities(mIntent,
                 PackageManager.MATCH_DEFAULT_ONLY);
         PackageManager pm= getActivity().getPackageManager();
         List<ResolveInfo> activities = pm.queryIntentActivities(mIntent,
                 PackageManager.MATCH_DEFAULT_ONLY);


@@ -143,11 +135,8 @@ public class ShareLinkToDialog  extends DialogFragment {
                                     actInfo.name);
                             mIntent.setComponent(name);
 
                                     actInfo.name);
                             mIntent.setComponent(name);
 

-                            // Send the intent
-                            dialog.dismiss();    // explicitly added for Android 2.x devices
-

                             // Send the file
                             // Send the file

-                            ((FileActivity)getActivity()).startActivity(mIntent);
+                            getActivity().startActivity(mIntent);

                         }
         })
         .create();
                         }
         })
         .create();

diff --git a/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java b/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
index fb6cce8..51dbf48 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
@@ -21,7 +21,6 @@ package com.owncloud.android.ui.dialog;
 import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;

-import android.content.Intent;

 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;


@@ -45,25 +44,21 @@ public class SharePasswordDialogFragment extends DialogFragment
         implements DialogInterface.OnClickListener {
 
     private static final String ARG_FILE = "FILE";
         implements DialogInterface.OnClickListener {
 
     private static final String ARG_FILE = "FILE";

-    private static final String ARG_SEND_INTENT = "SEND_INTENT";

 
     public static final String PASSWORD_FRAGMENT = "PASSWORD_FRAGMENT";
 
     private OCFile mFile;
 
     public static final String PASSWORD_FRAGMENT = "PASSWORD_FRAGMENT";
 
     private OCFile mFile;

-    private Intent mSendIntent;

 
     /**
      * Public factory method to create new SharePasswordDialogFragment instances.
      *
      * @param file
 
     /**
      * Public factory method to create new SharePasswordDialogFragment instances.
      *
      * @param file

-     * @param sendIntent

      * @return              Dialog ready to show.
      */
      * @return              Dialog ready to show.
      */

-    public static SharePasswordDialogFragment newInstance(OCFile file, Intent sendIntent) {
+    public static SharePasswordDialogFragment newInstance(OCFile file) {

         SharePasswordDialogFragment frag = new SharePasswordDialogFragment();
         Bundle args = new Bundle();
         args.putParcelable(ARG_FILE, file);
         SharePasswordDialogFragment frag = new SharePasswordDialogFragment();
         Bundle args = new Bundle();
         args.putParcelable(ARG_FILE, file);

-        args.putParcelable(ARG_SEND_INTENT, sendIntent);

         frag.setArguments(args);
         return frag;
     }
         frag.setArguments(args);
         return frag;
     }


@@ -71,7 +66,6 @@ public class SharePasswordDialogFragment extends DialogFragment
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         mFile = getArguments().getParcelable(ARG_FILE);
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         mFile = getArguments().getParcelable(ARG_FILE);

-        mSendIntent = getArguments().getParcelable(ARG_SEND_INTENT);

 
         // Inflate the layout for the dialog
         LayoutInflater inflater = getActivity().getLayoutInflater();
 
         // Inflate the layout for the dialog
         LayoutInflater inflater = getActivity().getLayoutInflater();


@@ -113,11 +107,8 @@ public class SharePasswordDialogFragment extends DialogFragment
             }
 
             // Share the file
             }
 
             // Share the file

-            if (mSendIntent == null) {
-                ((FileActivity) getActivity()).getFileOperationsHelper().
-                        setPasswordToShareViaLink(mFile, password);
-
-            }
+            ((FileActivity) getActivity()).getFileOperationsHelper().
+                    setPasswordToShareViaLink(mFile, password);

 
         } else {
             // Disable the flag "Share again"
 
         } else {
             // Disable the flag "Share again"