Merge pull request #14008 from nextcloud/backport/13944/stable-3.30

[stable-3.30] fix(sharing): make clear re-sharing prevented by policy or permissions
nextcloud · Nov 12, 2024 · e37a177 · e37a177
2 parents 87bbb11 + 36900d8
commit e37a177
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/...d.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png b/...d.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png
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
@@ -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);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -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>
@@ -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>