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 f4af7e1..af21f78 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@ -126,9 +126,11 @@ 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);                               
                                    

+                                   dialog.dismiss();    // explicitly added for Android 2.x devices
+

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

-
+                                   

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


@@ -146,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();