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

Merge pull request #4807 from 21pages/fix

Browse Source 
fix connection note
This commit is contained in:
RustDesk 2023-07-01 10:10:34 +08:00 committed by GitHub
commit c7b83cceaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1098,14 +1098,13 @@ showSetOSAccount(
});
}
showAuditDialog(SessionID sessionId, dialogManager) async {
final controller = TextEditingController();
dialogManager.show((setState, close, context) {
showAuditDialog(FFI ffi) async {
final controller = TextEditingController(text: ffi.auditNote);
ffi.dialogManager.show((setState, close, context) {
submit() {
var text = controller.text.trim();
if (text != '') {
bind.sessionSendNote(sessionId: sessionId, note: text);
}
var text = controller.text;
bind.sessionSendNote(sessionId: ffi.sessionId, note: text);
ffi.auditNote = text;
close();
}

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

@ -116,7 +116,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
v.add(
TTextMenu(
child: Text(translate('Note')),
onPressed: () => showAuditDialog(sessionId, ffi.dialogManager)),
onPressed: () => showAuditDialog(ffi)),
);
}
// divider

2
flutter/lib/models/model.dart
View File

@ -1575,6 +1575,7 @@ class FFI {
var version = '';
var connType = ConnType.defaultConn;
var closed = false;
var auditNote = '';
/// dialogManager use late to ensure init after main page binding [globalKey]
late final dialogManager = OverlayDialogManager();
@ -1624,6 +1625,7 @@ class FFI {
String? password,
bool? forceRelay}) {
closed = false;
auditNote = '';
assert(!(isFileTransfer && isPortForward), 'more than one connect type');
if (isFileTransfer) {
connType = ConnType.fileTransfer;

4
src/ui/header.tis
View File

@ -342,8 +342,8 @@ class Header: Reactor.Component {
<textarea .outline-focus spellcheck="false" name="text" novalue="input note here" style="overflow: scroll-indicator; width:*; height: 140px; font-size: 1.2em; padding: 0.5em;">{self.conn_note}</textarea>
</div>, "", function(res=null) {
if (!res) return;
if (!res.text) return;
self.conn_note = res.text;
if (res.text == null || res.text == undefined) return;
self.conn_note = res.text ?? "";
handler.send_note(res.text);
}, 280);
}

2
src/ui_session_interface.rs
View File

@ -1348,6 +1348,6 @@ async fn start_one_port_forward<T: InvokeUiSession>(
#[tokio::main(flavor = "current_thread")]
async fn send_note(url: String, id: String, conn_id: i32, note: String) {
let body = serde_json::json!({ "id": id, "Id": conn_id, "note": note });
let body = serde_json::json!({ "id": id, "conn_id": conn_id, "note": note });
allow_err!(crate::post_request(url, body.to_string(), "").await);
}