-
Notifications
You must be signed in to change notification settings - Fork 731
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.
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
Always display identity server policies #4184
Conversation
… control the expansion
…s the policy urls view
…pandable form item
… non discovery screens
…ws us to have custom arguments for the sub settings pages
- also meant updating the general link to discovery in order to manually pass the default arguments
…licy link from the consent dialog
is DiscoverySettingsAction.FinalizeBind3pid -> finalizeBind3pid(action, true) | ||
is DiscoverySettingsAction.SubmitMsisdnToken -> submitMsisdnToken(action) | ||
is DiscoverySettingsAction.CancelBinding -> cancelBinding(action) | ||
DiscoverySettingsAction.Refresh -> fetchContent() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
might be worth revisiting this formatting rule as it causes noisy diffs 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we had a debate about it... And noisy diff is THE inconvenient to keep aligned arrows. But with that we think the code is more readable...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this PR.
Some (quite minor) remarks.
I do not always have strong opinion for all of them.
Also I'm wondering if we shouldn't make the same work for homeserver policies, but lets do it later.
vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt
Outdated
Show resolved
Hide resolved
@@ -21,10 +21,18 @@ import com.airbnb.mvrx.MvRxState | |||
import com.airbnb.mvrx.Uninitialized | |||
|
|||
data class DiscoverySettingsState( | |||
val identityServer: Async<String?> = Uninitialized, | |||
val identityServer: Async<IdentityServerWithTerms?> = Uninitialized, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is strange to me, maybe the Async should be removed here...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
something to chat about tomorrow, I'm not familiar enough with the design to know why this async
is unexpected
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
More info can be found here: https://airbnb.io/mavericks/#/async
) : MvRxState | ||
|
||
data class IdentityServerWithTerms( | ||
val serverUrl: String, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... and added here ...
|
||
data class IdentityServerWithTerms( | ||
val serverUrl: String, | ||
val policies: List<IdentityServerPolicy> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... and here
|
||
<!-- Do not use drawableEnd on the TextView because of RTL support --> | ||
<ImageView | ||
android:id="@+id/term_policy_arrow" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: please rename this ID
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean cb72609 :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the update, tested OK 👍
(I've added a commit on develop with the changelog: b411938) |
@bmarty thanks! still not used to added them 🤦 |
#4174 Always show identity server policies
SettingsActivity
navigation to allow sub screen payloads (eg expanding policies)