hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3247 from grummbeer/improve-input-of-permanent-password

Browse Source 
improve input of permanent password
This commit is contained in:
RustDesk 2023-02-17 09:37:16 +08:00 committed by GitHub
commit dd0051caae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flutter/lib/desktop/pages/desktop_home_page.dart
View File

@ -596,13 +596,13 @@ void setPasswordDialog() async {
}); });
final pass = p0.text.trim(); final pass = p0.text.trim();
if (pass.isNotEmpty) { if (pass.isNotEmpty) {
for (var r in rules) { final Iterable violations = rules.where((r) => !r.validate(pass));
if (!r.validate(pass)) { if (violations.isNotEmpty) {
setState(() { setState(() {
errMsg0 = '${translate('Prompt')}: ${r.name}'; errMsg0 =
}); '${translate('Prompt')}: ${violations.map((r) => r.name).join(', ')}';
return; });
} return;
} }
} }
if (p1.text.trim() != pass) { if (p1.text.trim() != pass) {
@ -639,6 +639,9 @@ void setPasswordDialog() async {
autofocus: true, autofocus: true,
onChanged: (value) { onChanged: (value) {
rxPass.value = value.trim(); rxPass.value = value.trim();
setState(() {
errMsg0 = '';
});
}, },
), ),
), ),
@ -662,6 +665,11 @@ void setPasswordDialog() async {
labelText: translate('Confirmation'), labelText: translate('Confirmation'),
errorText: errMsg1.isNotEmpty ? errMsg1 : null), errorText: errMsg1.isNotEmpty ? errMsg1 : null),
controller: p1, controller: p1,
onChanged: (value) {
setState(() {
errMsg1 = '';
});
},
), ),
), ),
], ],