Skip to content
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

[stable-3.30] fix(sharing): make clear re-sharing prevented by policy or permissions #14008

Merged
merged 12 commits into from
Nov 12, 2024
Merged

[stable-3.30] fix(sharing): make clear re-sharing prevented by policy or permissions #14008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
940d1a7
fix(sharing): make clear re-sharing prevented by admin policy
joshtrichards Nov 4, 2024
d18151f
fix(sharing): Remove du reshare string from FileDetailSharingFragment
joshtrichards Nov 4, 2024
594e436
Update strings.xml
joshtrichards Nov 4, 2024
21bfa96
Update strings.xml
joshtrichards Nov 4, 2024
2ed1464
change screenshot
tobiasKaminsky Nov 6, 2024
5cc6fc4
fix(sharing): make clear re-sharing prevented by admin policy
joshtrichards Nov 4, 2024
a507f1c
fix(sharing): Remove du reshare string from FileDetailSharingFragment
joshtrichards Nov 4, 2024
aee2154
Update strings.xml
joshtrichards Nov 4, 2024
67b5987
Update strings.xml
joshtrichards Nov 4, 2024
fe92427
change screenshot
tobiasKaminsky Nov 6, 2024
b40fe04
fix check
tobiasKaminsky Nov 6, 2024
36900d8
remove unneeded string
tobiasKaminsky Nov 7, 2024
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
Binary file modified ...d.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion 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 @@ -239,7 +239,7 @@ private void setupView() {
binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
}
} else {
binding.searchView.setQueryHint(getResources().getString(R.string.reshare_not_allowed));
binding.searchView.setQueryHint(getResources().getString(R.string.resharing_is_not_allowed));
binding.searchView.setInputType(InputType.TYPE_NULL);
binding.pickContactEmailBtn.setVisibility(View.GONE);
disableSearchView(binding.searchView);
Expand Down
3 changes: 1 addition & 2 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 @@ -719,7 +719,7 @@
<string name="empty" translatable="false" />
<string name="test_server_button">Test server connection</string>
<string name="info_separator" translatable="false">&#160;&#x2022;</string>
<string name="resharing_is_not_allowed">Resharing is not allowed</string>
<string name="resharing_is_not_allowed">Policy or permissions prevent resharing</string>

<string name="foreground_service_upload">Uploading files…</string>
<string name="worker_download">Downloading files…</string>
Expand Down Expand Up @@ -957,7 +957,6 @@
<string name="storage_downloads">Downloads</string>
<string name="shared_avatar_desc">Avatar from shared user</string>
<string name="shared_with_you_by">Shared with you by %1$s</string>
<string name="reshare_not_allowed">Resharing is not allowed</string>
<string name="retrieving_file">Retrieving file…</string>
<string name="associated_account_not_found">Associated account not found!</string>
<string name="logged_in_as">Logged in as %1$s</string>
Expand Down