From 940d1a714ccc02879fffe072c9b695f036d4df96 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:42:19 -0500 Subject: [PATCH 01/12] fix(sharing): make clear re-sharing prevented by admin policy Fixes #10040 Signed-off-by: Josh --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f51bb78cb0a..b08fa8709017 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -719,7 +719,7 @@ Test server connection  • - Resharing is not allowed + Admin sharing policy disallows resharing. Uploading files… Downloading files… From d18151fa9b55118dea4fc5721e1e9c3933e60b84 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:47:12 -0500 Subject: [PATCH 02/12] fix(sharing): Remove du reshare string from FileDetailSharingFragment Signed-off-by: Josh --- .../owncloud/android/ui/fragment/FileDetailSharingFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 071faeee4666..11094ad20d02 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 @@ -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); From 594e436a254e440b17cd3224bf48aa5ded4e6a66 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:52:40 -0500 Subject: [PATCH 03/12] Update strings.xml Signed-off-by: Josh --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b08fa8709017..f60aca38292e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -719,7 +719,7 @@ Test server connection  • - Admin sharing policy disallows resharing. + Policy or permissions prevent resharing. Uploading files… Downloading files… From 21bfa968c20530566af36fc4832e2ed64fb139ce Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:56:23 -0500 Subject: [PATCH 04/12] Update strings.xml Signed-off-by: Josh --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f60aca38292e..2aa42bf9442c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -719,7 +719,7 @@ Test server connection  • - Policy or permissions prevent resharing. + Policy or permissions prevent resharing Uploading files… Downloading files… From 2ed1464118fc7ceea0fb36b5621670f8f97e0706 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 6 Nov 2024 07:35:30 +0100 Subject: [PATCH 05/12] change screenshot Signed-off-by: tobiasKaminsky --- ...ntIT_listSharesFileResharingNotAllowed.png | Bin 14900 -> 12227 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png index 40f2398ace78a604213a01f89f54180663c38dfc..29e6fd48d4b2d3238f12f2e7e6cc6fc2e1dcd53d 100644 GIT binary patch literal 12227 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 E3mY2ObpQYW From 5cc6fc4256cdd5d957a4a906483ba29e3d403ca9 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:42:19 -0500 Subject: [PATCH 06/12] fix(sharing): make clear re-sharing prevented by admin policy Fixes #10040 Signed-off-by: Josh From a507f1cd012ccd78b37faaeda36a710de1db4f05 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:47:12 -0500 Subject: [PATCH 07/12] fix(sharing): Remove du reshare string from FileDetailSharingFragment Signed-off-by: Josh From aee2154bad47d3adbba5b57252ededb4b824023d Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:52:40 -0500 Subject: [PATCH 08/12] Update strings.xml Signed-off-by: Josh From 67b598784050e8a8d66f9d03134927248bda118f Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 15:56:23 -0500 Subject: [PATCH 09/12] Update strings.xml Signed-off-by: Josh From fe92427585ae1c95be685449871551f7d75287bc Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 6 Nov 2024 07:35:30 +0100 Subject: [PATCH 10/12] change screenshot Signed-off-by: tobiasKaminsky From b40fe0474a6ed12790f4d13d58cd45dc1af0e373 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 6 Nov 2024 11:16:18 +0100 Subject: [PATCH 11/12] fix check Signed-off-by: tobiasKaminsky From 36900d89e6b3d05ba3f93a774b42893fcd87a112 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 7 Nov 2024 07:34:02 +0100 Subject: [PATCH 12/12] remove unneeded string Signed-off-by: tobiasKaminsky [skip ci] --- app/src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2aa42bf9442c..a0698c40a9ce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -957,7 +957,6 @@ Downloads Avatar from shared user Shared with you by %1$s - Resharing is not allowed Retrieving file… Associated account not found! Logged in as %1$s