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

Merge pull request #4859 from dignow/fix/toolbar_os_password

Browse Source 
Fix/toolbar os password
This commit is contained in:
RustDesk 2023-07-04 23:16:43 +08:00 committed by GitHub
commit 65924cb134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flutter/lib/common/widgets/dialog.dart
View File

@ -943,16 +943,20 @@ showSetOSPassword(
SessionID sessionId,
bool login,
OverlayDialogManager dialogManager,
String? osPassword,
Function()? closeCallback,
) async {
final controller = TextEditingController();
var password =
await bind.sessionGetOption(sessionId: sessionId, arg: 'os-password') ??
'';
osPassword ??= await bind.sessionGetOption(sessionId: sessionId, arg: 'os-password') ?? '';
var autoLogin =
await bind.sessionGetOption(sessionId: sessionId, arg: 'auto-login') !=
'';
controller.text = password;
controller.text = osPassword;
dialogManager.show((setState, close, context) {
closeWithCallback([dynamic]) {
close();
if (closeCallback != null) closeCallback();
}
submit() {
var text = controller.text.trim();
bind.sessionPeerOption(
@ -964,7 +968,7 @@ showSetOSPassword(
if (text != '' && login) {
bind.sessionInputOsPassword(sessionId: sessionId, value: text);
}
close();
closeWithCallback();
}
return CustomAlertDialog(
@ -998,7 +1002,7 @@ showSetOSPassword(
dialogButton(
"Cancel",
icon: Icon(Icons.close_rounded),
onPressed: close,
onPressed: closeWithCallback,
isOutline: true,
),
dialogButton(
@ -1008,7 +1012,7 @@ showSetOSPassword(
),
],
onSubmit: submit,
onCancel: close,
onCancel: closeWithCallback,
);
});
}

55
flutter/lib/common/widgets/toolbar.dart
View File

@ -11,6 +11,8 @@ import 'package:flutter_hbb/models/model.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:get/get.dart';
bool isEditOsPassword = false;
class TTextMenu {
final Widget child;
final VoidCallback onPressed;
@ -44,6 +46,28 @@ class TToggleMenu {
{required this.child, required this.value, required this.onChanged});
}
handleOsPasswordEditIcon(
SessionID sessionId, OverlayDialogManager dialogManager) {
isEditOsPassword = true;
showSetOSPassword(sessionId, false, dialogManager, null, () => isEditOsPassword = false);
}
handleOsPasswordAction(
SessionID sessionId, OverlayDialogManager dialogManager) async {
if (isEditOsPassword) {
isEditOsPassword = false;
return;
}
final password =
await bind.sessionGetOption(sessionId: sessionId, arg: 'os-password') ??
'';
if (password.isEmpty) {
showSetOSPassword(sessionId, true, dialogManager, password, () => isEditOsPassword = false);
} else {
bind.sessionInputOsPassword(sessionId: sessionId, value: password);
}
}
List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
final ffiModel = ffi.ffiModel;
final pi = ffiModel.pi;
@ -63,17 +87,26 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
// osAccount / osPassword
v.add(
TTextMenu(
child: Row(children: [
Text(translate(pi.is_headless ? 'OS Account' : 'OS Password')),
Offstage(
offstage: isDesktop,
child:
Icon(Icons.edit, color: MyTheme.accent).marginOnly(left: 12))
]),
trailingIcon: Transform.scale(scale: 0.8, child: Icon(Icons.edit)),
onPressed: () => pi.is_headless
? showSetOSAccount(sessionId, ffi.dialogManager)
: showSetOSPassword(sessionId, false, ffi.dialogManager)),
child: Row(children: [
Text(translate(pi.is_headless ? 'OS Account' : 'OS Password')),
Offstage(
offstage: isDesktop,
child: Icon(Icons.edit, color: MyTheme.accent).marginOnly(left: 12),
)
]),
trailingIcon: Transform.scale(
scale: 0.8,
child: InkWell(
onTap: () => pi.is_headless
? showSetOSAccount(sessionId, ffi.dialogManager)
: handleOsPasswordEditIcon(sessionId, ffi.dialogManager),
child: Icon(Icons.edit),
),
),
onPressed: () => pi.is_headless
? showSetOSAccount(sessionId, ffi.dialogManager)
: handleOsPasswordAction(sessionId, ffi.dialogManager),
),
);
// paste
if (isMobile && perms['keyboard'] != false && perms['clipboard'] != false) {