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

fix custom client show ip whiltelist warning (#8778)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-07-22 17:00:29 +08:00 committed by GitHub
parent 4723d6a830
commit 22f3425ace
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/common.dart
View File

@ -3425,6 +3425,12 @@ get defaultOptionWhitelist => isCustomClient ? ',' : '';
get defaultOptionAccessMode => isCustomClient ? 'custom' : ''; get defaultOptionAccessMode => isCustomClient ? 'custom' : '';
get defaultOptionApproveMode => isCustomClient ? 'password-click' : ''; get defaultOptionApproveMode => isCustomClient ? 'password-click' : '';
bool whitelistNotEmpty() {
// https://rustdesk.com/docs/en/self-host/client-configuration/advanced-settings/#whitelist
final v = bind.mainGetOptionSync(key: kOptionWhitelist);
return v != '' && v != ',';
}
// `setMovable()` is only supported on macOS. // `setMovable()` is only supported on macOS.
// //
// On macOS, the window can be dragged by the tab bar by default. // On macOS, the window can be dragged by the tab bar by default.

7
flutter/lib/desktop/pages/desktop_setting_page.dart
View File

@ -1119,12 +1119,9 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
bool enabled = !locked; bool enabled = !locked;
// Simple temp wrapper for PR check // Simple temp wrapper for PR check
tmpWrapper() { tmpWrapper() {
RxBool hasWhitelist = (bind.mainGetOptionSync(key: kOptionWhitelist) != RxBool hasWhitelist = whitelistNotEmpty().obs;
defaultOptionWhitelist)
.obs;
update() async { update() async {
hasWhitelist.value = bind.mainGetOptionSync(key: kOptionWhitelist) != hasWhitelist.value = whitelistNotEmpty();
defaultOptionWhitelist;
} }
onChanged(bool? checked) async { onChanged(bool? checked) async {

7
flutter/lib/mobile/pages/settings_page.dart
View File

@ -97,8 +97,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
kOptionEnableAbr, bind.mainGetOptionSync(key: kOptionEnableAbr)); kOptionEnableAbr, bind.mainGetOptionSync(key: kOptionEnableAbr));
_denyLANDiscovery = !option2bool(kOptionEnableLanDiscovery, _denyLANDiscovery = !option2bool(kOptionEnableLanDiscovery,
bind.mainGetOptionSync(key: kOptionEnableLanDiscovery)); bind.mainGetOptionSync(key: kOptionEnableLanDiscovery));
_onlyWhiteList = (bind.mainGetOptionSync(key: kOptionWhitelist)) != _onlyWhiteList = whitelistNotEmpty();
defaultOptionWhitelist;
_enableDirectIPAccess = option2bool( _enableDirectIPAccess = option2bool(
kOptionDirectServer, bind.mainGetOptionSync(key: kOptionDirectServer)); kOptionDirectServer, bind.mainGetOptionSync(key: kOptionDirectServer));
_enableRecordSession = option2bool(kOptionEnableRecordSession, _enableRecordSession = option2bool(kOptionEnableRecordSession,
@ -282,9 +281,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
initialValue: _onlyWhiteList, initialValue: _onlyWhiteList,
onToggle: (_) async { onToggle: (_) async {
update() async { update() async {
final onlyWhiteList = final onlyWhiteList = whitelistNotEmpty();
(await bind.mainGetOption(key: kOptionWhitelist)) !=
defaultOptionWhitelist;
if (onlyWhiteList != _onlyWhiteList) { if (onlyWhiteList != _onlyWhiteList) {
setState(() { setState(() {
_onlyWhiteList = onlyWhiteList; _onlyWhiteList = onlyWhiteList;