rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code reviews

Browse Source
This commit is contained in:
Valere 2022-07-12 10:17:41 +02:00
parent 6657d6c5af
commit ac7b47b8b2
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
View File

@ -185,14 +185,6 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
} }
} }
} }
} else if (!isMine) {
if (currentSessionIsTrusted) {
// we can propose to verify it
val isVerified = cryptoDeviceInfo.trustLevel?.crossSigningVerified.orFalse()
if (!isVerified) {
addVerifyActions(cryptoDeviceInfo)
}
}
} }
} else } else
/** if (!isMine) **/ /** if (!isMine) **/

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

@ -2353,7 +2353,7 @@
<string name="crosssigning_verify_this_session">Verify this device</string> <string name="crosssigning_verify_this_session">Verify this device</string>
<string name="crosssigning_cannot_verify_this_session">Unable to verify this device</string> <string name="crosssigning_cannot_verify_this_session">Unable to verify this device</string>
<string name="crosssigning_cannot_verify_this_session_desc">You won\'t be able to access encrypted message history. Reset your Secure Message Backup and verification keys to start fresh.</string> <string name="crosssigning_cannot_verify_this_session_desc">You won’t be able to access encrypted message history. Reset your Secure Message Backup and verification keys to start fresh.</string>
<string name="verification_open_other_to_verify">Use an existing session to verify this one, granting it access to encrypted messages.</string> <string name="verification_open_other_to_verify">Use an existing session to verify this one, granting it access to encrypted messages.</string>