Skip to content

rework share flow #16183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobiasKaminsky wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −6
Open

rework share flow #16183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1292,7 +1288,7 @@ public boolean onFileActionChosen(@IdRes final int itemId, Set<OCFile> 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);
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/res/layout/file_details_sharing_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,19 @@

</LinearLayout>

<com.google.android.material.button.MaterialButton
android:id="@+id/send_copy_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_double_margin"
android:layout_marginEnd="@dimen/standard_double_margin"
android:layout_marginTop="@dimen/standard_half_padding"
android:layout_marginBottom="@dimen/standard_half_padding"
app:icon="@drawable/file_link"
app:iconGravity="textStart"
android:text="@string/send_copy_to" />

<TextView
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/zero"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,4 +1474,5 @@

<string name="failed_to_create_conflict_dialog">Failed to create conflict dialog</string>
<string name="editor_web_view_cannot_open_file">Cannot open file chooser</string>
<string name="send_copy_to">Send copy to</string>
</resources>
Loading