Merge branch 'master' into service

This commit is contained in:
rustdesk
2022-04-14 13:54:28 +08:00
6 changed files with 102 additions and 100 deletions

View File

@@ -19,7 +19,7 @@ class ConnectionPage extends StatefulWidget implements PageShape {
final title = translate("Connection");
@override
final appBarActions = isWeb ? <Widget>[WebMenu()] : <Widget>[];
final appBarActions = !isAndroid ? <Widget>[WebMenu()] : <Widget>[];
@override
final scrollController = ScrollController();
@@ -261,7 +261,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
PopupMenuItem<String>(
child: Text(translate('Remove')), value: 'remove')
] +
(isWeb
(!isAndroid
? []
: [
PopupMenuItem<String>(