Merge branch 'develop' into send_file_pr311_with_develop

[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 b651d33..af21f78 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@ -111,7 +111,10 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
         Collections.sort(activities, new ResolveInfo.DisplayNameComparator(pm)); 
         mAdapter = new ActivityAdapter(getSherlockActivity(), pm, activities);
         
         Collections.sort(activities, new ResolveInfo.DisplayNameComparator(pm)); 
         mAdapter = new ActivityAdapter(getSherlockActivity(), pm, activities);
         

+       
+        

         if (sendAction) {
         if (sendAction) {

+        

             return new AlertDialog.Builder(getSherlockActivity())
                        .setTitle(R.string.activity_chooser_send_file_title)
                        .setAdapter(mAdapter, new DialogInterface.OnClickListener() {
             return new AlertDialog.Builder(getSherlockActivity())
                        .setTitle(R.string.activity_chooser_send_file_title)
                        .setAdapter(mAdapter, new DialogInterface.OnClickListener() {


@@ -123,14 +126,14 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
                                    ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
                                    mIntent.setComponent(name);                               
                                    
                                    ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
                                    mIntent.setComponent(name);                               
                                    

-                                   // Send the file
-                                   FileOperationsHelper foh = new FileOperationsHelper();
-                                   foh.sendFileToApp(mIntent, (FileActivity)getSherlockActivity()); 
+                                   dialog.dismiss();    // explicitly added for Android 2.x devices

 
 

+                                   // Send the file
+                                   ((FileActivity)getSherlockActivity()).startActivity(mIntent);
+                                   

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

-

         } else {
             return new AlertDialog.Builder(getSherlockActivity())
                        .setTitle(R.string.activity_chooser_title)
         } else {
             return new AlertDialog.Builder(getSherlockActivity())
                        .setTitle(R.string.activity_chooser_title)


@@ -145,7 +148,8 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
                             
                                    // Create a new share resource
                                    FileOperationsHelper foh = new FileOperationsHelper();
                             
                                    // Create a new share resource
                                    FileOperationsHelper foh = new FileOperationsHelper();

-                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity()); 
+                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity());
+                                   

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