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

feat: Allow manual verification of other peoples devices See merge request famedly/fluffychat!374
5 years ago · 70541b58ec
parent 8dd0036c57 9bc9915469
commit 70541b58ec
1 changed files with 4 additions and 4 deletions
--- a/lib/views/chat_encryption_settings.dart
+++ b/lib/views/chat_encryption_settings.dart
@ -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(