diff --git a/changelog/unreleased/4952 b/changelog/unreleased/4952 index b6a01ce8126..0693f09b1ba 100644 --- a/changelog/unreleased/4952 +++ b/changelog/unreleased/4952 @@ -6,3 +6,4 @@ It will be only visible for users with proper permissions. https://github.com/owncloud/android/issues/4875 https://github.com/owncloud/android/issues/4917 https://github.com/owncloud/android/pull/4952 +https://github.com/owncloud/android/pull/5000 diff --git a/changelog/unreleased/4978 b/changelog/unreleased/4978 index 3a4dd9072ff..ec786bb0b0d 100644 --- a/changelog/unreleased/4978 +++ b/changelog/unreleased/4978 @@ -5,3 +5,4 @@ It will be only visible for users with proper permissions. https://github.com/owncloud/android/issues/4937 https://github.com/owncloud/android/pull/4978 +https://github.com/owncloud/android/pull/5000 diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/AddGraphShareFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/AddGraphShareFragment.kt index 977cf44339f..fe147b4f61c 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/AddGraphShareFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/AddGraphShareFragment.kt @@ -88,6 +88,8 @@ class AddGraphShareFragment : Fragment(), SearchMembersAdapter.SearchMembersAdap editMode = requireArguments().getBoolean(ARG_EDIT_MODE, false) roles = requireArguments().getParcelableArrayList(ARG_ROLES) ?: emptyList() + requireActivity().title = getString(if (editMode) R.string.share_edit else R.string.share_add) + searchMembersAdapter = SearchMembersAdapter(this) recyclerView = binding.membersRecyclerView recyclerView.apply { diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt index 5cbc137e924..3a1a0094ae4 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt @@ -69,6 +69,7 @@ class GraphShareFragment : Fragment(), GraphSharesAdapter.GraphSharesAdapterList override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + requireActivity().title = getString(R.string.share_dialog_title) binding.membersTitle.text = getString(R.string.share_with_people_title) graphSharesAdapter = GraphSharesAdapter(this) diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index 2e6ff3455e6..928bf9f393f 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -494,11 +494,13 @@ Users and Groups No data shared with users yet Shares could not be refreshed + Create share Share created correctly Share could not be created Is already shared with this user/group Share removed correctly Share could not be removed + Edit share Share edited correctly Share could not be edited Public links