diff --git a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt index 1b3169b..747df13 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt @@ -262,12 +262,20 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher rxDialogSureCancel.show() } else { android.util.Log.i("AAAAAAAAAAAAA::","data isSubbed::: "+isSubbed) - if(isSubbed){ - startClash() + if (checkExpire()) { + if (isAdded) { + RxToast.info(resources.getString(R.string.AccountExpired)) + } + return@setOnClickListener }else{ - RxToast.success(resources.getString(R.string.tooFast)) + if(isSubbed){ + startClash() + }else{ + RxToast.success(resources.getString(R.string.tooFast)) + } } + } } clActivity.setOnClickListener { diff --git a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt index 9bbb900..0379208 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt @@ -329,7 +329,12 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc startActivity(intent) } initializationRepair.setOnClickListener { + if (checkExpire()) { + RxToast.info(resources.getString(R.string.AccountExpired)) + return@setOnClickListener + } if (TextUtils.isEmpty(subUrl)) { + RxToast.success(resources.getString(R.string.tooFast)) return@setOnClickListener } cleanNodeMmkv()