From 501323ff6a878d6e244cffe7c13bddae6b11104f Mon Sep 17 00:00:00 2001 From: rustdesk Date: Fri, 9 Jun 2023 19:57:37 +0800 Subject: [PATCH] const sessionId for mobile --- flutter/lib/mobile/pages/file_manager_page.dart | 1 - flutter/lib/mobile/pages/remote_page.dart | 2 -- flutter/lib/models/model.dart | 5 +++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/flutter/lib/mobile/pages/file_manager_page.dart b/flutter/lib/mobile/pages/file_manager_page.dart index 709b0ba81..d6e366ad6 100644 --- a/flutter/lib/mobile/pages/file_manager_page.dart +++ b/flutter/lib/mobile/pages/file_manager_page.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_breadcrumb/flutter_breadcrumb.dart'; -import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/models/file_model.dart'; import 'package:get/get.dart'; import 'package:toggle_switch/toggle_switch.dart'; diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart index 7d629ff4e..f1270d501 100644 --- a/flutter/lib/mobile/pages/remote_page.dart +++ b/flutter/lib/mobile/pages/remote_page.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:convert'; import 'dart:ui' as ui; import 'package:flutter/material.dart'; @@ -11,7 +10,6 @@ import 'package:flutter_hbb/mobile/widgets/gesture_help.dart'; import 'package:flutter_hbb/models/chat_model.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:get/get.dart'; -import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart'; import 'package:provider/provider.dart'; import 'package:wakelock/wakelock.dart'; diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart index 3b12aca5a..8043d5287 100644 --- a/flutter/lib/models/model.dart +++ b/flutter/lib/models/model.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'dart:math'; -import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:flutter/material.dart'; @@ -39,6 +38,7 @@ import 'platform_model.dart'; typedef HandleMsgBox = Function(Map evt, String id); typedef ReconnectHandle = Function(OverlayDialogManager, SessionID, bool); final _waitForImage = {}; +final _constSessionId = Uuid().v4obj(); class FfiModel with ChangeNotifier { PeerInfo _pi = PeerInfo(); @@ -1580,7 +1580,6 @@ enum ConnType { defaultConn, fileTransfer, portForward, rdp } /// Flutter state manager and data communication with the Rust core. class FFI { - final sessionId = Uuid().v4obj(); var id = ''; var version = ''; var connType = ConnType.defaultConn; @@ -1589,6 +1588,7 @@ class FFI { /// dialogManager use late to ensure init after main page binding [globalKey] late final dialogManager = OverlayDialogManager(); + late final SessionID sessionId; late final ImageModel imageModel; // session late final FfiModel ffiModel; // session late final CursorModel cursorModel; // session @@ -1606,6 +1606,7 @@ class FFI { late final ElevationModel elevationModel; // session FFI() { + sessionId = isDesktop ? Uuid().v4obj() : _constSessionId; imageModel = ImageModel(WeakReference(this)); ffiModel = FfiModel(WeakReference(this)); cursorModel = CursorModel(WeakReference(this));