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

Fix description of verified sessions (PSG-991) #7533

Merged
merged 5 commits into from
Nov 9, 2022
Merged

Fix description of verified sessions (PSG-991) #7533

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44c0378
Fix description of verified sessions.
Nov 7, 2022
e30cbd5
Add changelog.
Nov 7, 2022
ba6d414
Code review fix.
Nov 9, 2022
b2589a1
Merge branch 'develop' into feature/ons/fix_device_manager_verified_desc
Nov 9, 2022
40e960f
Lint fix.
Nov 9, 2022
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
1 change: 1 addition & 0 deletions changelog.d/7533.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix description of verified sessions
2 changes: 2 additions & 0 deletions library/ui-strings/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3373,7 +3373,9 @@
<string name="device_manager_learn_more_sessions_unverified_title">Unverified sessions</string>
<string name="device_manager_learn_more_sessions_unverified">Unverified sessions are sessions that have logged in with your credentials but not been cross-verified.\n\nYou should make especially certain that you recognise these sessions as they could represent an unauthorised use of your account.</string>
<string name="device_manager_learn_more_sessions_verified_title">Verified sessions</string>
<!-- TODO TO BE REMOVED -->
<string name="device_manager_learn_more_sessions_verified">Verified sessions have logged in with your credentials and then been verified, either using your secure passphrase or by cross-verifying.\n\nThis means they hold encryption keys for your previous messages, and confirm to other users you are communicating with that these sessions are really you.</string>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tools:ignore="UnusedResources" needs to be added on the key which has to be removed.

<string name="device_manager_learn_more_sessions_verified_description">Verified sessions are anywhere you are using ${app_name} after entering your passphrase or confirming your identity with another verified session.\n\nThis means that you have all the keys needed to unlock your encrypted messages and confirm to other users that you trust this session.</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other sessions are not necessarily using Element (${app_name} here). To check with product, because it is maybe a bit technical to replace with a Matrix client, even if this is more true.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could use "anywhere you are using this account"? @jakewb-b WDYT?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anywhere you are using this account

Yes, that's ideal. Thanks for spotting that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should also warn other platforms of this change so that we use the same text everywhere to be consistent.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@onurays in case you have done so already, could you update our internal task that tracks this to reflect the wording change? If some platforms have already done this task, they may need a separate ticket.

<string name="device_manager_learn_more_session_rename_title">Renaming sessions</string>
<string name="device_manager_learn_more_session_rename">Other users in direct messages and rooms that you join are able to view a full list of your sessions.\n\nThis provides them with confidence that they are really speaking to you, but it also means they can see the session name you enter here.</string>
<string name="labs_enable_session_manager_title">Enable new session manager</string>
Expand Down
5 changes: 4 additions & 1 deletion ...in/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ class OtherSessionsFragment :
)
)
views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_verified_sessions_found)
updateSecurityLearnMoreButton(R.string.device_manager_learn_more_sessions_verified_title, R.string.device_manager_learn_more_sessions_verified)
updateSecurityLearnMoreButton(
R.string.device_manager_learn_more_sessions_verified_title,
R.string.device_manager_learn_more_sessions_verified_description
)
}
DeviceManagerFilterType.UNVERIFIED -> {
views.otherSessionsSecurityRecommendationView.render(
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ class SessionOverviewFragment :
R.string.device_manager_verification_status_unverified
}
val descriptionResId = if (isVerified) {
R.string.device_manager_learn_more_sessions_verified
R.string.device_manager_learn_more_sessions_verified_description
} else {
R.string.device_manager_learn_more_sessions_unverified
}
Expand Down