diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java index 969b29c8d349..d29004f57582 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java @@ -39,6 +39,7 @@ import com.nextcloud.client.database.entity.FileEntity; import com.nextcloud.client.di.Injectable; import com.nextcloud.client.network.ClientFactory; +import com.nextcloud.client.utils.IntentUtil; import com.nextcloud.utils.extensions.BundleExtensionsKt; import com.nextcloud.utils.extensions.FileExtensionsKt; import com.nextcloud.utils.extensions.OCShareExtensionsKt; @@ -342,6 +343,14 @@ private void setupView() { } checkShareViaUser(); + + if (file.isFolder()) { + binding.sendCopyBtn.setVisibility(View.GONE); + } + binding.sendCopyBtn.setOnClickListener(v -> + startActivity(Intent.createChooser(IntentUtil.createSendIntent(requireContext(), file), + requireContext().getString(R.string.activity_chooser_send_file_title))) + ); } private void checkShareViaUser() { diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 981a234510b0..2d70e88dd86c 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -616,11 +616,7 @@ public void createRichWorkspace() { @Override public void onShareIconClick(OCFile file) { - if (file.isFolder()) { - mContainerActivity.showDetails(file, 1); - } else { - throttler.run("shareIconClick", () -> mContainerActivity.getFileOperationsHelper().sendShareFile(file)); - } + mContainerActivity.showDetails(file, 1); } @Override @@ -1292,7 +1288,7 @@ public boolean onFileActionChosen(@IdRes final int itemId, Set checkedFi OCFile singleFile = checkedFiles.iterator().next(); if (itemId == R.id.action_send_share_file) { - mContainerActivity.getFileOperationsHelper().sendShareFile(singleFile); + mContainerActivity.showDetails(singleFile, 1); return true; } else if (itemId == R.id.action_open_file_with) { mContainerActivity.getFileOperationsHelper().openFile(singleFile); diff --git a/app/src/main/res/layout/file_details_sharing_fragment.xml b/app/src/main/res/layout/file_details_sharing_fragment.xml index 310c49197c6e..6aebef09bd0d 100644 --- a/app/src/main/res/layout/file_details_sharing_fragment.xml +++ b/app/src/main/res/layout/file_details_sharing_fragment.xml @@ -123,6 +123,19 @@ + + Failed to create conflict dialog Cannot open file chooser + Send copy to