diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart index c6a70460d..d6be51986 100644 --- a/flutter/lib/common.dart +++ b/flutter/lib/common.dart @@ -233,7 +233,7 @@ class AccessibilityListener extends StatelessWidget { } }, onPointerUp: (evt) { - if (evt.size == 1 && GestureBinding.instance != null) { + if (evt.size == 1) { GestureBinding.instance.handlePointerEvent(PointerUpEvent( pointer: evt.pointer + offset, size: 0.1, @@ -243,7 +243,7 @@ class AccessibilityListener extends StatelessWidget { } }, onPointerMove: (evt) { - if (evt.size == 1 && GestureBinding.instance != null) { + if (evt.size == 1) { GestureBinding.instance.handlePointerEvent(PointerMoveEvent( pointer: evt.pointer + offset, size: 0.1, diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart index 49184cf5b..e4afc892f 100644 --- a/flutter/lib/models/file_model.dart +++ b/flutter/lib/models/file_model.dart @@ -593,15 +593,7 @@ class FileFetcher { tryCompleteTask(String? msg, String? isLocalStr) { if (msg == null || isLocalStr == null) return; - late final isLocal; late final tasks; - if (isLocalStr == "true") { - isLocal = true; - } else if (isLocalStr == "false") { - isLocal = false; - } else { - return; - } try { final fd = FileDirectory.fromJson(jsonDecode(msg)); if (fd.id > 0) { diff --git a/flutter/lib/models/native_model.dart b/flutter/lib/models/native_model.dart index f6824dda8..a600e372e 100644 --- a/flutter/lib/models/native_model.dart +++ b/flutter/lib/models/native_model.dart @@ -21,7 +21,6 @@ typedef F2 = Pointer Function(Pointer, Pointer); typedef F3 = void Function(Pointer, Pointer); class PlatformFFI { - static Pointer? _lastRgbaFrame; static String _dir = ''; static String _homeDir = ''; static F2? _getByName; diff --git a/flutter/lib/models/web_model.dart b/flutter/lib/models/web_model.dart index d9668272a..3ec6c9b9f 100644 --- a/flutter/lib/models/web_model.dart +++ b/flutter/lib/models/web_model.dart @@ -1,3 +1,5 @@ +// ignore_for_file: avoid_web_libraries_in_flutter + import 'dart:convert'; import 'dart:typed_data'; import 'dart:js'; diff --git a/flutter/lib/pages/connection_page.dart b/flutter/lib/pages/connection_page.dart index 2cfbaa63b..90f290136 100644 --- a/flutter/lib/pages/connection_page.dart +++ b/flutter/lib/pages/connection_page.dart @@ -100,8 +100,8 @@ class _ConnectionPageState extends State { : InkWell( onTap: () async { final url = _updateUrl + '.apk'; - if (await canLaunch(url)) { - await launch(url); + if (await canLaunchUrl(Uri.parse(url))) { + await launchUrl(Uri.parse(url)); } }, child: Container( diff --git a/flutter/lib/pages/remote_page.dart b/flutter/lib/pages/remote_page.dart index 9feef9577..b93069203 100644 --- a/flutter/lib/pages/remote_page.dart +++ b/flutter/lib/pages/remote_page.dart @@ -126,7 +126,7 @@ class _RemotePageState extends State { common < oldValue.length && common < newValue.length && newValue[common] == oldValue[common]; - ++common); + ++common) {} for (i = 0; i < oldValue.length - common; ++i) { FFI.inputKey('VK_BACK'); } diff --git a/flutter/lib/pages/settings_page.dart b/flutter/lib/pages/settings_page.dart index 90ff0d564..2c8b7fe9a 100644 --- a/flutter/lib/pages/settings_page.dart +++ b/flutter/lib/pages/settings_page.dart @@ -68,8 +68,8 @@ class _SettingsState extends State { tiles: [ SettingsTile.navigation( onPressed: (context) async { - if (await canLaunch(url)) { - await launch(url); + if (await canLaunchUrl(Uri.parse(url))) { + await launchUrl(Uri.parse(url)); } }, title: Text(translate("Version: ") + version), @@ -105,8 +105,8 @@ void showAbout() { InkWell( onTap: () async { const url = 'https://rustdesk.com/'; - if (await canLaunch(url)) { - await launch(url); + if (await canLaunchUrl(Uri.parse(url))) { + await launchUrl(Uri.parse(url)); } }, child: Padding( @@ -149,7 +149,7 @@ fetch('http://localhost:21114/api/login', { 'uuid': FFI.getByName('uuid') }; try { - final response = await http.post(Uri.parse('${url}/api/login'), + final response = await http.post(Uri.parse('$url/api/login'), headers: {"Content-Type": "application/json"}, body: json.encode(body)); return parseResp(response.body); } catch (e) { @@ -186,7 +186,7 @@ void refreshCurrentUser() async { 'uuid': FFI.getByName('uuid') }; try { - final response = await http.post(Uri.parse('${url}/api/currentUser'), + final response = await http.post(Uri.parse('$url/api/currentUser'), headers: { "Content-Type": "application/json", "Authorization": "Bearer $token" @@ -212,7 +212,7 @@ void logout() async { 'uuid': FFI.getByName('uuid') }; try { - await http.post(Uri.parse('${url}/api/logout'), + await http.post(Uri.parse('$url/api/logout'), headers: { "Content-Type": "application/json", "Authorization": "Bearer $token" @@ -242,7 +242,7 @@ String getUrl() { url = 'http://${tmp[0]}:$port'; } } else { - url = 'http://${url}:21114'; + url = 'http://$url:21114'; } } } diff --git a/flutter/lib/widgets/gestures.dart b/flutter/lib/widgets/gestures.dart index d70fe05e6..960439678 100644 --- a/flutter/lib/widgets/gestures.dart +++ b/flutter/lib/widgets/gestures.dart @@ -594,10 +594,7 @@ class _TapTracker { required this.entry, required Duration doubleTapMinTime, required this.gestureSettings, - }) : assert(doubleTapMinTime != null), - assert(event != null), - assert(event.buttons != null), - pointer = event.pointer, + }) : pointer = event.pointer, _initialGlobalPosition = event.position, initialButtons = event.buttons, _doubleTapMinTimeCountdown = @@ -643,7 +640,7 @@ class _TapTracker { /// CountdownZoned tracks whether the specified duration has elapsed since /// creation, honoring [Zone]. class _CountdownZoned { - _CountdownZoned({required Duration duration}) : assert(duration != null) { + _CountdownZoned({required Duration duration}) { Timer(duration, _onTimeout); }