remove more "rustdesk" built-in

This commit is contained in:
rustdesk
2024-02-25 13:29:06 +08:00
parent 9ff1dfe019
commit a28c9f8f36
15 changed files with 66 additions and 50 deletions

View File

@@ -1889,7 +1889,7 @@ bool handleUriLink({List<String>? cmdArgs, Uri? uri, String? uriString}) {
if (cmdArgs != null && cmdArgs.isNotEmpty) {
args = cmdArgs;
// rustdesk <uri link>
if (args[0].startsWith(kUniLinksPrefix)) {
if (args[0].startsWith(bind.mainUriPrefixSync())) {
final uri = Uri.tryParse(args[0]);
if (uri != null) {
args = urlLinkToCmdArgs(uri);
@@ -2429,19 +2429,20 @@ int versionCmp(String v1, String v2) {
}
String getWindowName({WindowType? overrideType}) {
final name = bind.mainGetAppNameSync();
switch (overrideType ?? kWindowType) {
case WindowType.Main:
return "RustDesk";
return name;
case WindowType.FileTransfer:
return "File Transfer - RustDesk";
return "File Transfer - $name";
case WindowType.PortForward:
return "Port Forward - RustDesk";
return "Port Forward - $name";
case WindowType.RemoteDesktop:
return "Remote Desktop - RustDesk";
return "Remote Desktop - $name";
default:
break;
}
return "RustDesk";
return name;
}
String getWindowNameWithId(String id, {WindowType? overrideType}) {

View File

@@ -71,7 +71,6 @@ const String kOptionOpenInWindows = "allow-open-in-windows";
const String kOptionForceAlwaysRelay = "force-always-relay";
const String kOptionViewOnly = "view-only";
const String kUniLinksPrefix = "rustdesk://";
const String kUrlActionClose = "close";
const String kTabLabelHomePage = "Home";

View File

@@ -322,7 +322,9 @@ class _DesktopHomePageState extends State<DesktopHomePage>
}
Future<Widget> buildHelpCards() async {
if (updateUrl.isNotEmpty && !isCardClosed) {
if (updateUrl.isNotEmpty &&
!isCardClosed &&
bind.mainUriPrefixSync().contains('rustdesk')) {
return buildInstallCard(
"Status",
"There is a newer version of ${bind.mainGetAppNameSync()} ${bind.mainGetNewVersion()} available.",

View File

@@ -8,7 +8,7 @@ import 'package:qr_code_scanner/qr_code_scanner.dart';
import 'package:zxing2/qrcode.dart';
import '../../common.dart';
import '../../consts.dart';
import '../../models/platform_model.dart';
import '../widgets/dialog.dart';
class ScanPage extends StatefulWidget {
@@ -61,7 +61,7 @@ class _ScanPageState extends State<ScanPage> {
var reader = QRCodeReader();
try {
var result = reader.decode(bitmap);
if (result.text.startsWith(kUniLinksPrefix)) {
if (result.text.startsWith(bind.mainUriPrefixSync())) {
handleUriLink(uriString: result.text);
} else {
showServerSettingFromQr(result.text);

View File

@@ -379,7 +379,7 @@ class FfiModel with ChangeNotifier {
onUrlSchemeReceived(Map<String, dynamic> evt) {
final url = evt['url'].toString().trim();
if (url.startsWith(kUniLinksPrefix) && handleUriLink(uriString: url)) {
if (url.startsWith(bind.mainUriPrefixSync()) && handleUriLink(uriString: url)) {
return;
}
switch (url) {