From f2a0e4877a173c40418895dbb2f05dd252bf4c44 Mon Sep 17 00:00:00 2001 From: Kr328 <39107975+Kr328@users.noreply.github.com> Date: Thu, 21 Nov 2019 23:43:00 +0800 Subject: [PATCH] use object instance instead of int --- .../main/java/com/github/kr328/clash/MainActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt index 2dd8542..7221689 100644 --- a/app/src/main/java/com/github/kr328/clash/MainActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/MainActivity.kt @@ -62,8 +62,8 @@ class MainActivity : AppCompatActivity() { clashStatus.observe(this) { handler.removeMessages(0) handler.postDelayed({ - when ( it.status ) { - ClashProcessStatus.STATUS_STARTED_INT -> { + when ( it ) { + ClashProcessStatus.STATUS_STARTED -> { activity_main_clash_status_icon.setImageResource(R.drawable.ic_clash_started) activity_main_clash_status_title.text = getString(R.string.clash_status_started) activity_main_clash_status_summary.text = getString(R.string.clash_status_forwarded_traffic, "1.4GiB") @@ -82,9 +82,9 @@ class MainActivity : AppCompatActivity() { } activity_main_clash_status.setOnClickListener { - when ( clashStatus.value?.status ?: ClashProcessStatus.STATUS_STOPPED_INT ) { - ClashProcessStatus.STATUS_STARTED_INT -> {} - ClashProcessStatus.STATUS_STOPPED_INT -> { + when ( clashStatus.value ?: ClashProcessStatus.STATUS_STOPPED ) { + ClashProcessStatus.STATUS_STARTED -> {} + ClashProcessStatus.STATUS_STOPPED -> { VpnService.prepare(this)?.apply { startActivityForResult(this, VPN_REQUEST_CODE) } ?: startService(Intent(this, TunService::class.java))