Merge branch 'soru/allow-foreign-manual-verify' into 'main'

feat: Allow manual verification of other peoples devices

See merge request famedly/fluffychat!374
This commit is contained in:
Krille Fear 2021-02-06 13:57:49 +00:00
commit e06132e17e

View File

@ -173,16 +173,16 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
child: Text(L10n.of(context).verifyStart),
value: 'verify',
));
items.add(PopupMenuItem(
child: Text(L10n.of(context).verifyManual),
value: 'verify_manual',
));
} else {
items.add(PopupMenuItem(
child: Text(L10n.of(context).verifyUser),
value: 'verify_user',
));
}
items.add(PopupMenuItem(
child: Text(L10n.of(context).verifyManual),
value: 'verify_manual',
));
}
if (deviceKeys[i].blocked) {
items.add(PopupMenuItem(