Retry forbidden share adding a password only if the value of 'enforce password' optio...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / ShareActivity.java

diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index 9c4d33e..7bfc4c5 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -25,11 +25,13 @@ import android.app.SearchManager;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;

+import android.support.v4.app.DialogFragment;

 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;

+import com.owncloud.android.operations.CreateShareViaLinkOperation;

 import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
 
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
 
 import com.owncloud.android.lib.common.operations.RemoteOperation;


@@ -37,10 +39,13 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;

+import com.owncloud.android.ui.dialog.ShareLinkToDialog;

 import com.owncloud.android.ui.fragment.SearchShareesFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;
 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
 
 import com.owncloud.android.ui.fragment.SearchShareesFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;
 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
 

+import org.apache.http.protocol.HTTP;
+

 
 /**
  * Activity for sharing files
 
 /**
  * Activity for sharing files


@@ -55,6 +60,8 @@ public class ShareActivity extends FileActivity
     private static final String TAG_SHARE_FRAGMENT = "SHARE_FRAGMENT";
     private static final String TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT";
 
     private static final String TAG_SHARE_FRAGMENT = "SHARE_FRAGMENT";
     private static final String TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT";
 

+    /** Tag for dialog */
+    private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";

 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {


@@ -156,6 +163,19 @@ public class ShareActivity extends FileActivity
         if (result.isSuccess()) {
             Log_OC.d(TAG, "Refreshing view on successful operation");
             refreshSharesFromStorageManager();
         if (result.isSuccess()) {
             Log_OC.d(TAG, "Refreshing view on successful operation");
             refreshSharesFromStorageManager();

+
+            if (operation instanceof CreateShareViaLinkOperation) {
+                // Send link to the app
+                String link = ((OCShare) (result.getData().get(0))).getShareLink();
+                Log_OC.d(TAG, "Share link = " + link);
+
+                Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
+                intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
+                intentToShareLink.setType(HTTP.PLAIN_TEXT_TYPE);
+                String[] packagesToExclude = new String[]{getPackageName()};
+                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+                chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+            }

         }
     }
 
         }
     }
 


@@ -168,6 +188,7 @@ public class ShareActivity extends FileActivity
         ShareFileFragment shareFileFragment = getShareFileFragment();
         if (shareFileFragment != null
                 && shareFileFragment.isAdded()) {   // only if added to the view hierarchy!!
         ShareFileFragment shareFileFragment = getShareFileFragment();
         if (shareFileFragment != null
                 && shareFileFragment.isAdded()) {   // only if added to the view hierarchy!!

+            shareFileFragment.refreshCapabilitiesFromDB();

             shareFileFragment.refreshUsersOrGroupsListFromDB();
             shareFileFragment.refreshPublicShareFromDB();
         }
             shareFileFragment.refreshUsersOrGroupsListFromDB();
             shareFileFragment.refreshPublicShareFromDB();
         }