Skip to content

Fix quick settings tile collapsing the notification panel #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NKU100 wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −2
Open

Fix quick settings tile collapsing the notification panel #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf38532
Fix quick settings tile collapsing the notification panel
NKU100 Sep 2, 2026
995bc71
Fix Go core build on Windows hosts
NKU100 Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions android/app/src/main/kotlin/com/follow/clash/ServiceState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ object ServiceState {
}
}

fun toggleRequiresVpnConsent(): Boolean {
if (isRunningRequested()) {
return false
}
val options = sharedState.vpnOptions
?: GlobalState.application.sharedState.vpnOptions
?: return false
return options.enable && VpnService.prepare(GlobalState.application) != null
}

suspend fun refresh(): Long = transitionLock.withLock {
val current = runTimeMillis
mutableRunState.value = if (current == 0L) RunState.STOPPED else RunState.STARTED
Expand Down
7 changes: 6 additions & 1 deletion android/app/src/main/kotlin/com/follow/clash/TileService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.follow.clash
import android.annotation.SuppressLint
import android.os.Build
import android.service.quicksettings.Tile
import com.follow.clash.common.GlobalState
import com.follow.clash.common.QuickAction
import com.follow.clash.common.quickIntent
import com.follow.clash.common.toPendingIntent
Expand All @@ -28,7 +29,11 @@ class TileService : android.service.quicksettings.TileService() {

override fun onClick() {
super.onClick()
openQuickAction()
if (ServiceState.toggleRequiresVpnConsent()) {
openQuickAction()
} else {
GlobalState.launch { ServiceState.handleToggleAction() }
}
}

override fun onStopListening() {
Expand Down
5 changes: 4 additions & 1 deletion plugins/setup/buildkit/build_tool/lib/src/go_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ String _resolveCc(Target target) {
if (entries.isEmpty) {
throw BuildException('No NDK prebuilt toolchain found in $prebuiltDir');
}
return p.join(entries.first.path, 'bin', target.ndkCcName);
final ccName = Platform.isWindows
? '${target.ndkCcName}.cmd'
: target.ndkCcName;
return p.join(entries.first.path, 'bin', ccName);
}

class GoBuilder {
Expand Down