Skip to content

Fix external Clash control shortcuts #805

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
ZenX404 wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −17
Open

Fix external Clash control shortcuts #805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 19 additions & 17 deletions app/src/main/java/com/github/kr328/clash/ExternalControlActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.util.setUUID
import com.github.kr328.clash.design.MainDesign
import com.github.kr328.clash.design.ui.ToastDuration
import com.github.kr328.clash.remote.Remote
import com.github.kr328.clash.remote.StatusClient
import com.github.kr328.clash.service.model.Profile
import com.github.kr328.clash.util.startClashService
Expand Down Expand Up @@ -56,30 +55,33 @@ class ExternalControlActivity : Activity(), CoroutineScope by MainScope() {
return
}

Intents.ACTION_TOGGLE_CLASH -> if(Remote.broadcasts.clashRunning) {
stopClash()
}
else {
startClash()
}

Intents.ACTION_START_CLASH -> if(!Remote.broadcasts.clashRunning) {
startClash()
Intents.ACTION_TOGGLE_CLASH -> {
if (isClashRunning()) {
stopClash()
} else {
startClash()
}
}
else {
Toast.makeText(this, R.string.external_control_started, Toast.LENGTH_LONG).show()

Intents.ACTION_START_CLASH -> {
if (isClashRunning()) {
Toast.makeText(this, R.string.external_control_started, Toast.LENGTH_LONG).show()
} else {
startClash()
}
}

Intents.ACTION_STOP_CLASH -> if(Remote.broadcasts.clashRunning) {
Intents.ACTION_STOP_CLASH -> {
stopClash()
}
else {
Toast.makeText(this, R.string.external_control_stopped, Toast.LENGTH_LONG).show()
}
}
return finish()
}

private fun isClashRunning(): Boolean {
return StatusClient(this).currentProfile() != null
}

private fun startClash() {
// if (currentProfile == null) {
// Toast.makeText(this, R.string.no_profile_selected, Toast.LENGTH_LONG).show()
Expand Down
Loading