Skip to content

Commit 13c2a09

Browse files
tonylu00tonylu00
authored
Merge branch 'rustdesk:master' into master
2 parents 9516380 + 40999c3 commit 13c2a09

File tree

19 files changed

+87
-104
lines changed

19 files changed

+87
-104
lines changed

‎Cargo.lock‎

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ crate-type = ["cdylib", "staticlib", "rlib"]
1616
name = "naming"
1717
path = "src/naming.rs"
1818

19+
[[bin]]
20+
name = "service"
21+
path = "src/service.rs"
22+
1923
[features]
2024
inline = []
2125
cli = []

‎build.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,13 @@ def build_flutter_dmg(version, features):
405405
if not skip_cargo:
406406
# set minimum osx build target, now is 10.14, which is the same as the flutter xcode project
407407
system2(
408-
f'MACOSX_DEPLOYMENT_TARGET=10.14 cargo build --features {features} --lib --release')
408+
f'MACOSX_DEPLOYMENT_TARGET=10.14 cargo build --features {features} --release')
409409
# copy dylib
410410
system2(
411411
"cp target/release/liblibrustdesk.dylib target/release/librustdesk.dylib")
412412
os.chdir('flutter')
413413
system2('flutter build macos --release')
414+
system2('cp -rf ../target/release/service ./build/macos/Build/Products/Release/RustDesk.app/Contents/MacOS/')
414415
'''
415416
system2(
416417
"create-dmg --volname \"RustDesk Installer\" --window-pos 200 120 --window-size 800 400 --icon-size 100 --app-drop-link 600 185 --icon RustDesk.app 200 190 --hide-extension RustDesk.app rustdesk.dmg ./build/macos/Build/Products/Release/RustDesk.app")

‎flutter/lib/desktop/pages/desktop_home_page.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -834,10 +834,6 @@ class _DesktopHomePageState extends State<DesktopHomePage>
834834
_uniLinksSubscription?.cancel();
835835
Get.delete<RxBool>(tag: 'stop-service');
836836
_updateTimer?.cancel();
837-
if (!bind.isCustomClient()) {
838-
platformFFI.unregisterEventHandler(
839-
kCheckSoftwareUpdateFinish, kCheckSoftwareUpdateFinish);
840-
}
841837
WidgetsBinding.instance.removeObserver(this);
842838
super.dispose();
843839
}

‎flutter/lib/desktop/pages/desktop_setting_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,6 @@ class _GeneralState extends State<_General> {
607607
bool user_dir_exists = await Directory(user_dir).exists();
608608
bool root_dir_exists =
609609
showRootDir ? await Directory(root_dir).exists() : false;
610-
// canLaunchUrl blocked on windows portable, user SYSTEM
611610
return {
612611
'user_dir': user_dir,
613612
'root_dir': root_dir,

‎flutter/lib/mobile/pages/connection_page.dart‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,15 @@ class _ConnectionPageState extends State<ConnectionPage> {
107107
: InkWell(
108108
onTap: () async {
109109
final url = 'https://rustdesk.com/download';
110-
// https://pub.dev/packages/url_launcher#configuration
110+
// https://pub.dev/packages/url_launcher#configuration
111111
// https://developer.android.com/training/package-visibility/use-cases#open-urls-custom-tabs
112112
//
113113
// `await launchUrl(Uri.parse(url))` can also run if skip
114114
// 1. The following check
115115
// 2. `<action android:name="android.support.customtabs.action.CustomTabsService" />` in AndroidManifest.xml
116116
//
117117
// But it is better to add the check.
118-
if (await canLaunchUrl(Uri.parse(url))) {
119-
await launchUrl(Uri.parse(url));
120-
}
118+
await launchUrl(Uri.parse(url));
121119
},
122120
child: Container(
123121
alignment: AlignmentDirectional.center,
@@ -370,10 +368,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
370368
if (Get.isRegistered<TextEditingController>()) {
371369
Get.delete<TextEditingController>();
372370
}
373-
if (!bind.isCustomClient()) {
374-
platformFFI.unregisterEventHandler(
375-
kCheckSoftwareUpdateFinish, kCheckSoftwareUpdateFinish);
376-
}
377371
super.dispose();
378372
}
379373
}

‎flutter/lib/mobile/pages/settings_page.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
782782
tiles: [
783783
SettingsTile(
784784
onPressed: (context) async {
785-
if (await canLaunchUrl(Uri.parse(url))) {
786-
await launchUrl(Uri.parse(url));
787-
}
785+
await launchUrl(Uri.parse(url));
788786
},
789787
title: Text(translate("Version: ") + version),
790788
value: Padding(
@@ -928,9 +926,7 @@ void showAbout(OverlayDialogManager dialogManager) {
928926
InkWell(
929927
onTap: () async {
930928
const url = 'https://rustdesk.com/';
931-
if (await canLaunchUrl(Uri.parse(url))) {
932-
await launchUrl(Uri.parse(url));
933-
}
929+
await launchUrl(Uri.parse(url));
934930
},
935931
child: Padding(
936932
padding: EdgeInsets.symmetric(vertical: 8),

‎flutter/macos/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@ SPEC CHECKSUMS:
9595
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
9696
desktop_multi_window: 566489c048b501134f9d7fb6a2354c60a9126486
9797
device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
98-
file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
98+
file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9
9999
flutter_custom_cursor: 629957115075c672287bd0fa979d863ccf6024f7
100100
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
101101
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
102-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
102+
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
103103
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
104104
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
105105
texture_rgba_renderer: cbed959a3c127122194a364e14b8577bd62dc8f2
106106
uni_links_desktop: 45900fb319df48fcdea2df0756e9c2626696b026
107-
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
108-
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
107+
url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
108+
video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
109109
wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
110110
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
111111
window_size: 339dafa0b27a95a62a843042038fa6c3c48de195

‎flutter/macos/Runner/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
var launched = false;
77
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {

‎flutter/pubspec.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,18 +1351,18 @@ packages:
13511351
dependency: "direct main"
13521352
description:
13531353
name: url_launcher
1354-
sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c
1354+
sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
13551355
url: "https://pub.dev"
13561356
source: hosted
1357-
version: "6.2.4"
1357+
version: "6.3.1"
13581358
url_launcher_android:
13591359
dependency: transitive
13601360
description:
13611361
name: url_launcher_android
1362-
sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f"
1362+
sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193"
13631363
url: "https://pub.dev"
13641364
source: hosted
1365-
version: "6.2.2"
1365+
version: "6.3.14"
13661366
url_launcher_ios:
13671367
dependency: "direct main"
13681368
description:

0 commit comments

Comments
 (0)