X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/01483a38bf667e626b66c39604b6c9576afec206..b368a4b853e7dff2e5c53166dde75b107df85656:/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java

diff --git a/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java b/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
index d8f507b1..51dbf486 100644
--- a/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
@@ -18,11 +18,11 @@
  */
 package com.owncloud.android.ui.dialog;
 
-import android.app.AlertDialog;
+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.view.View;
 import android.view.WindowManager;
@@ -30,7 +30,6 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.FileActivity;
@@ -41,29 +40,25 @@ import com.owncloud.android.ui.activity.FileActivity;
  * Triggers the share when the password is introduced.
  */
 
-public class SharePasswordDialogFragment extends SherlockDialogFragment
+public class SharePasswordDialogFragment extends DialogFragment
         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;
-    private Intent mSendIntent;
 
     /**
      * Public factory method to create new SharePasswordDialogFragment instances.
      *
      * @param file
-     * @param sendIntent
      * @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);
-        args.putParcelable(ARG_SEND_INTENT, sendIntent);
         frag.setArguments(args);
         return frag;
     }
@@ -71,7 +66,6 @@ public class SharePasswordDialogFragment extends SherlockDialogFragment
     @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();
@@ -98,7 +92,7 @@ public class SharePasswordDialogFragment extends SherlockDialogFragment
     public void onClick(DialogInterface dialog, int which) {
         if (which == AlertDialog.BUTTON_POSITIVE) {
             // Enable the flag "Share again"
-            ((FileActivity) getSherlockActivity()).setTryShareAgain(true);
+            ((FileActivity) getActivity()).setTryShareAgain(true);
 
             String password =
                     ((TextView)(getDialog().findViewById(R.id.share_password)))
@@ -113,12 +107,12 @@ public class SharePasswordDialogFragment extends SherlockDialogFragment
             }
 
             // Share the file
-            ((FileActivity)getSherlockActivity()).getFileOperationsHelper()
-                                    .shareFileWithLinkToApp(mFile, password, mSendIntent);
+            ((FileActivity) getActivity()).getFileOperationsHelper().
+                    setPasswordToShareViaLink(mFile, password);
 
         } else {
             // Disable the flag "Share again"
-            ((FileActivity) getSherlockActivity()).setTryShareAgain(false);
+            ((FileActivity) getActivity()).setTryShareAgain(false);
         }
     }
 }