filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1312 from vector-im/feature/post_smoke_test_fix

Browse Source 
Feature/post smoke test fix
This commit is contained in:
Valere 2020-04-30 17:37:04 +02:00 committed by GitHub
commit 4589aaa11c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
View File

@ -113,7 +113,7 @@ class HomeDetailFragment @Inject constructor(
VerificationVectorAlert( VerificationVectorAlert(
uid = uid, uid = uid,
title = getString(R.string.new_session), title = getString(R.string.new_session),
description = getString(R.string.new_session_review_with_info, newest.displayName ?: "", newest.deviceId ?: ""), description = getString(R.string.verify_this_session, newest.displayName ?: newest.deviceId ?: ""),
iconId = R.drawable.ic_shield_warning iconId = R.drawable.ic_shield_warning
).apply { ).apply {
matrixItem = user matrixItem = user

2
vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt
View File

@ -63,7 +63,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
} }
} }
is Success -> { is Success -> {
val deviceList = data.cryptoDevices.invoke().sortedByDescending { val deviceList = data.cryptoDevices.invoke().sortedBy {
it.isVerified it.isVerified
} }

2
vector/src/main/res/values/strings.xml
View File

@ -2354,6 +2354,8 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
<string name="encrypted_unverified">Encrypted by an unverified device</string> <string name="encrypted_unverified">Encrypted by an unverified device</string>
<string name="review_logins">Review where you’re logged in</string> <string name="review_logins">Review where you’re logged in</string>
<string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string> <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
<!-- Argument will be replaced by the other session name (e.g, Riot Desktop, mobile) -->
<string name="verify_this_session">Verify the new login accessing your account: %1$s</string>
<string name="cross_signing_verify_by_text">Manually Verify by Text</string> <string name="cross_signing_verify_by_text">Manually Verify by Text</string>
<string name="crosssigning_verify_session">Verify login</string> <string name="crosssigning_verify_session">Verify login</string>