From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 351631FF18C for <inbox@lore.proxmox.com>; Mon, 12 May 2025 17:09:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5857186CB; Mon, 12 May 2025 17:10:10 +0200 (CEST) From: Shan Shaji <s.shaji@proxmox.com> To: pve-devel@lists.proxmox.com Date: Mon, 12 May 2025 17:10:02 +0200 Message-Id: <20250512151002.1590-1-s.shaji@proxmox.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.400 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH pve_flutter_frontend] ui: enable noVNC console on iOS X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> This patch enables the noVNC console view on iOS devices. It also includes a refactor of the function responsible for displaying the webview. Additionally, an `AppBar` has been added to the console view on iOS to allow users to easily close the view. Signed-off-by: Shan Shaji <s.shaji@proxmox.com> --- lib/widgets/pve_console_menu_widget.dart | 86 +++++++++++------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/lib/widgets/pve_console_menu_widget.dart b/lib/widgets/pve_console_menu_widget.dart index f4bd8d3..e9481c0 100644 --- a/lib/widgets/pve_console_menu_widget.dart +++ b/lib/widgets/pve_console_menu_widget.dart @@ -103,45 +103,19 @@ class PveConsoleMenu extends StatelessWidget { } }, ), - if (Platform.isAndroid) // web_view is only available for mobile :( + + // web_view is only available for mobile :( + // xterm.js doesn't work that well on mobile + if (Platform.isAndroid || Platform.isIOS) ListTile( title: const Text( - //type == "qemu" ? "noVNC Console" : "xterm.js Console", - "noVNC Console", // xterm.js doesn't work that well on mobile + "noVNC Console", style: TextStyle(fontWeight: FontWeight.bold), ), subtitle: const Text("Open console view"), - onTap: () async { - if (Platform.isAndroid) { - if (['qemu', 'lxc'].contains(type)) { - SystemChrome.setEnabledSystemUIMode( - SystemUiMode.immersive); - Navigator.of(context) - .push(_createHTMLConsoleRoute()) - .then((completion) { - SystemChrome.setEnabledSystemUIMode( - SystemUiMode.edgeToEdge, - overlays: [ - SystemUiOverlay.top, - SystemUiOverlay.bottom - ]); - }); - } else if (type == 'node') { - SystemChrome.setEnabledSystemUIMode( - SystemUiMode.immersive); - Navigator.of(context) - .push(_createHTMLConsoleRoute()) - .then((completion) { - SystemChrome.setEnabledSystemUIMode( - SystemUiMode.edgeToEdge, - overlays: [ - SystemUiOverlay.top, - SystemUiOverlay.bottom - ]); - }); - } - } else { - print('not implemented for current platform'); + onTap: () { + if (['qemu', 'lxc'].contains(type) || type == 'node') { + _openNoVncConsole(context); } }, ), @@ -151,6 +125,18 @@ class PveConsoleMenu extends StatelessWidget { ); } + Future<void> _openNoVncConsole(BuildContext context) async { + SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive); + await Navigator.push(context, _createHTMLConsoleRoute()); + SystemChrome.setEnabledSystemUIMode( + SystemUiMode.edgeToEdge, + overlays: [ + SystemUiOverlay.top, + SystemUiOverlay.bottom, + ], + ); + } + void showTextDialog(BuildContext context, String title, String content) { showDialog( context: context, @@ -232,14 +218,16 @@ class PVEWebConsoleState extends State<PVEWebConsole> { WidgetsFlutterBinding.ensureInitialized(); return FutureBuilder( - future: CookieManager.instance().setCookie( - url: WebUri(consoleUrl), - name: 'PVEAuthCookie', - value: ticket, - ), - builder: (context, snapshot) { - return ColoredSafeArea( - child: InAppWebView( + future: CookieManager.instance().setCookie( + url: WebUri(consoleUrl), + name: 'PVEAuthCookie', + value: ticket, + ), + builder: (context, snapshot) { + return ColoredSafeArea( + child: Scaffold( + appBar: Platform.isIOS ? AppBar() : null, + body: InAppWebView( onReceivedServerTrustAuthRequest: (controller, challenge) async { final cert = challenge.protectionSpace.sslCertificate; final certBytes = cert?.x509Certificate?.encoded; @@ -294,12 +282,18 @@ class PVEWebConsoleState extends State<PVEWebConsole> { urlRequest: URLRequest(url: WebUri(consoleUrl))); }, ), - ); - }); + ), + ); + }, + ); } - Future<bool> showTLSWarning(BuildContext context, String sslError, - String issuedTo, String hash) async { + Future<bool> showTLSWarning( + BuildContext context, + String sslError, + String issuedTo, + String hash, + ) async { return await showDialog( context: context, barrierDismissible: false, -- 2.39.5 (Apple Git-154) _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel