Merge pull request #13944 from nextcloud/jtr/fix-10040

fix(sharing): make clear re-sharing prevented by policy or permissions
nextcloud · Nov 7, 2024 · a05d638 · a05d638
2 parents 6d0aaa6 + d60864a
commit a05d638
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 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
@@ -727,7 +727,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>
@@ -965,7 +965,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>

diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh
@@ -18,7 +18,7 @@ ruby scripts/analysis/lint-up.rb
 lintValue=$?
 
 curl "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.xml" -o "/tmp/$stableBranch.xml"
-[[ ! -e test1 ]] && exit 1
+[[ ! -e "/tmp/$stableBranch.xml" ]] && exit 1
 
 ruby scripts/analysis/spotbugs-up.rb "$stableBranch"
 spotbugsValue=$?