From 48a38dba46aef6225b5e23bb838774d48184260a Mon Sep 17 00:00:00 2001 From: Edison Jwa Date: Wed, 20 May 2026 10:19:23 +0900 Subject: [PATCH] fix(android): prompt from locked channel rows --- apps/chanora_flutter/lib/main.dart | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/apps/chanora_flutter/lib/main.dart b/apps/chanora_flutter/lib/main.dart index 2a0ea5a..aa44e44 100644 --- a/apps/chanora_flutter/lib/main.dart +++ b/apps/chanora_flutter/lib/main.dart @@ -2160,20 +2160,21 @@ class _SnapshotView extends StatelessWidget { ? null : () => onJoinChannelWithPassword(ch), ), - IconButton( - icon: Icon( - ch.id == pendingVoiceChannelId - ? Icons.hourglass_top - : Icons.login, + if (!ch.hasPassword) + IconButton( + icon: Icon( + ch.id == pendingVoiceChannelId + ? Icons.hourglass_top + : Icons.login, + ), + tooltip: ch.id == pendingVoiceChannelId + ? l10n.statusConnecting + : l10n.joinChannelAction, + onPressed: + hasJoinPending || ch.id == pendingVoiceChannelId + ? null + : () => onJoinChannel(ch), ), - tooltip: ch.id == pendingVoiceChannelId - ? l10n.statusConnecting - : l10n.joinChannelAction, - onPressed: - hasJoinPending || ch.id == pendingVoiceChannelId - ? null - : () => onJoinChannel(ch), - ), ], ), selected: ch.id == currentVoiceChannelId, @@ -2182,7 +2183,9 @@ class _SnapshotView extends StatelessWidget { !canJoinVoiceChannel || ch.id == currentVoiceChannelId ? null - : () => onJoinChannel(ch), + : () => ch.hasPassword + ? onJoinChannelWithPassword(ch) + : onJoinChannel(ch), ), ), for (final cl in byChannel[ch.id] ?? const [])