Filter only '/' character in user input when version of server is 8.1 or later

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / ShareLinkToDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
index 3076e27..fc88e5d 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2014 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -42,16 +45,14 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;

-import com.owncloud.android.files.FileOperationsHelper;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.activity.ComponentsGetter;

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

-import com.owncloud.android.utils.Log_OC;

 
 /**
  * Dialog showing a list activities able to resolve a given Intent, 
  * filtering out the activities matching give package names.
 
 /**
  * Dialog showing a list activities able to resolve a given Intent, 
  * filtering out the activities matching give package names.

- * 
- * @author David A. Velasco

  */
 public class ShareLinkToDialog  extends SherlockDialogFragment {
     
  */
 public class ShareLinkToDialog  extends SherlockDialogFragment {
     


@@ -132,7 +133,9 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
                             // Add the information of the chosen activity to the intent to send 
                             ResolveInfo chosen = mAdapter.getItem(which);
                             ActivityInfo actInfo = chosen.activityInfo;
                             // Add the information of the chosen activity to the intent to send 
                             ResolveInfo chosen = mAdapter.getItem(which);
                             ActivityInfo actInfo = chosen.activityInfo;

-                            ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
+                            ComponentName name=new ComponentName(
+                                    actInfo.applicationInfo.packageName, 
+                                    actInfo.name);

                             mIntent.setComponent(name);                               
 
                             if (sendAction) {
                             mIntent.setComponent(name);                               
 
                             if (sendAction) {


@@ -143,8 +146,8 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
 
                             } else {
                                 // Create a new share resource
 
                             } else {
                                 // Create a new share resource

-                                FileOperationsHelper foh = new FileOperationsHelper();
-                                foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity());
+                                ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper()
+                                    .shareFileWithLinkToApp(mFile, "", mIntent);

                             }
                         }
         })
                             }
                         }
         })