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

Jump to bottom

Always display identity server policies #4184

Merged
merged 18 commits into from
Oct 7, 2021
Merged

Always display identity server policies #4184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a2f6417
adding the identity terms to the discovery page state
ouchadam Oct 6, 2021
04d844b
allowing the expandable scrollbar to be hidden
ouchadam Oct 6, 2021
7ce811c
binding the indentity server policy urls to the discovery page
ouchadam Oct 6, 2021
5a4f320
binding the expanded state as part of the view, allows us to manually…
ouchadam Oct 6, 2021
3111d0b
updating discovery consent dialog to include policy link which expand…
ouchadam Oct 6, 2021
7e8ca29
creating dedicated discovery policy items and displaying within an ex…
ouchadam Oct 7, 2021
2f732af
updating policy title to include show/hide
ouchadam Oct 7, 2021
c0fd266
using consistent naming for the policy and opening a chrome tab when …
ouchadam Oct 7, 2021
0516694
navigating to the settings discovery page on policy link clicked from…
ouchadam Oct 7, 2021
728f34f
converting the settings activity payload to a sealed class, this allo…
ouchadam Oct 7, 2021
7b5972e
expanding the discovery polices on recieving a custom payload
ouchadam Oct 7, 2021
791c92c
launching the discovery page with policy expanded when tapping the po…
ouchadam Oct 7, 2021
496a531
reverting uneedeed text item changes
ouchadam Oct 7, 2021
cccda9b
using single action for the updating the policy expanded toggling/sta…
ouchadam Oct 7, 2021
d00858f
handling empty policy list by showing empty copy
ouchadam Oct 7, 2021
259b6d5
using singular for the policy copy name to match content
ouchadam Oct 7, 2021
cb72609
renaming xml view to avoid clashing with other file
ouchadam Oct 7, 2021
5365e87
reducing the discovery policy url text size by using caption style
ouchadam Oct 7, 2021
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
Prev Previous commit
Next Next commit
using singular for the policy copy name to match content
  • Loading branch information
@ouchadam
ouchadam committed Oct 7, 2021
commit 259b6d56d7e0b70f13c9c3365135bc2a32944fd2
4 changes: 2 additions & 2 deletions vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ class DiscoverySettingsController @Inject constructor(
formAdvancedToggleItem {
id("policy-urls")
val titleRes = if (data.isIdentityPolicyUrlsExpanded) {
R.string.settings_discovery_hide_identity_server_policies_title
} else R.string.settings_discovery_show_identity_server_policies_title
R.string.settings_discovery_hide_identity_server_policy_title
} else R.string.settings_discovery_show_identity_server_policy_title
title(host.stringProvider.getString(titleRes))
expanded(data.isIdentityPolicyUrlsExpanded)
listener { host.listener?.onPolicyUrlsExpandedStateToggled(!data.isIdentityPolicyUrlsExpanded) }
Expand Down
4 changes: 2 additions & 2 deletions vector/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,8 +2349,8 @@
<string name="add_identity_server">Configure identity server</string>
<string name="open_discovery_settings">Open Discovery Settings</string>
<string name="change_identity_server">Change identity server</string>
<string name="settings_discovery_show_identity_server_policies_title">Show identity server policy</string>
<string name="settings_discovery_hide_identity_server_policies_title">Hide identity server policy</string>
<string name="settings_discovery_show_identity_server_policy_title">Show identity server policy</string>
<string name="settings_discovery_hide_identity_server_policy_title">Hide identity server policy</string>
<string name="settings_discovery_no_policy_provided">No policy provided by the identity server</string>
<string name="settings_discovery_identity_server_info">You are currently using %1$s to discover and be discoverable by existing contacts you know.</string>
<string name="settings_discovery_identity_server_info_none">You are not currently using an identity server. To discover and be discoverable by existing contacts you know, configure one below.</string>
Expand Down